From 1bfb8d35cdced4cbf92e337a4963ed46b343be67 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 6 Aug 2017 16:39:10 +0800
Subject: [PATCH 1/2] Move "Copy hash" menu item above "Copy magnet link"

Fix wrong "Copy hash" icon used in webUI
Fixup of 145641ac41dbbc4a65df86ee7cf0c91b9abda81d
---
 src/gui/transferlistwidget.cpp   | 2 +-
 src/webui/www/private/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index 79f699ff4..b45c6e184 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@@ -1091,8 +1091,8 @@ void TransferListWidget::displayListMenu(const QPoint&)
     }
     listMenu.addSeparator();
     listMenu.addAction(&actionCopy_name);
-    listMenu.addAction(&actionCopy_magnet_link);
     listMenu.addAction(&actionCopyHash);
+    listMenu.addAction(&actionCopy_magnet_link);
     // Call menu
     QAction *act = 0;
     act = listMenu.exec(QCursor::pos());
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index 4d85de23f..150016cb9 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -130,8 +130,8 @@
         <li><a href="#FirstLastPiecePrio"><img src="theme/checked" alt="QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]"/> QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]</a></li>
         <li class="separator"><a href="#ForceRecheck"><img src="theme/document-edit-verify" alt="QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]"/>  QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]</a></li>
         <li class="separator"><a href="#" id="CopyName" class="copyToClipboard"><img src="theme/edit-copy" alt="QBT_TR(Copy name)QBT_TR[CONTEXT=TransferListWidget]"/>  QBT_TR(Copy name)QBT_TR[CONTEXT=TransferListWidget]</a></li>
+        <li><a href="#" id="CopyHash" class="copyToClipboard"><img src="theme/edit-copy" alt="QBT_TR(Copy hash)QBT_TR[CONTEXT=TransferListWidget]"/>  QBT_TR(Copy hash)QBT_TR[CONTEXT=TransferListWidget]</a></li>
         <li><a href="#" id="CopyMagnetLink" class="copyToClipboard"><img src="theme/kt-magnet" alt="QBT_TR(Copy magnet link)QBT_TR[CONTEXT=TransferListWidget]"/>  QBT_TR(Copy magnet link)QBT_TR[CONTEXT=TransferListWidget]</a></li>
-        <li><a href="#" id="CopyHash" class="copyToClipboard"><img src="theme/kt-magnet" alt="QBT_TR(Copy hash)QBT_TR[CONTEXT=TransferListWidget]"/>  QBT_TR(Copy hash)QBT_TR[CONTEXT=TransferListWidget]</a></li>
     </ul>
     <ul id="categoriesFilterMenu" class="contextMenu">
         <li><a href="#CreateCategory"><img src="theme/list-add" alt="QBT_TR(Add category...)QBT_TR[CONTEXT=CategoryFilterWidget]"/> QBT_TR(Add category...)QBT_TR[CONTEXT=CategoryFilterWidget]</a></li>

From 3e9311b09655e091ccba62186efb113884da2c50 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 6 Aug 2017 17:08:14 +0800
Subject: [PATCH 2/2] Correctly handle translation

Fixup of 07a85a10187a4684afb342b31cbc38da9f78a183
---
 src/webui/extra_translations.h        | 1 +
 src/webui/www/public/setlocation.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webui/extra_translations.h b/src/webui/extra_translations.h
index a634d0f60..7048c085f 100644
--- a/src/webui/extra_translations.h
+++ b/src/webui/extra_translations.h
@@ -75,6 +75,7 @@ static const char *__TRANSLATIONS__[] = {
     QT_TRANSLATE_NOOP("HttpServer", "Hard Disk"),
     QT_TRANSLATE_NOOP("HttpServer", "Share ratio limit must be between 0 and 9998.")
     QT_TRANSLATE_NOOP("HttpServer", "Seeding time limit must be between 0 and 525600 minutes.")
+    QT_TRANSLATE_NOOP("HttpServer", "Set location")
 };
 
 static const struct { const char *source; const char *comment; } __COMMENTED_TRANSLATIONS__[] = {
diff --git a/src/webui/www/public/setlocation.html b/src/webui/www/public/setlocation.html
index ddc08a231..94a171ca8 100644
--- a/src/webui/www/public/setlocation.html
+++ b/src/webui/www/public/setlocation.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>QBT_TR(Set location)QBT_TR[CONTEXT=TransferListWidget]</title>
+    <title>QBT_TR(Set location)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
     <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>