Rework relocate dialog in Qt client to load from .ui

diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 5ce3154f5e850939ca55ffbae14144b261a6883e..662fb9f2f3f96c3ce5c99489e4ba852e04924290 100644 (file)
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -104,6 +104,7 @@ tr_qt_wrap_ui(${PROJECT_NAME}_UI_SOURCES
     about.ui
     details.ui
     mainwin.ui
+    relocate.ui
     session-dialog.ui
     stats-dialog.ui
 )

diff --git a/qt/qtr.pro b/qt/qtr.pro
index 662d63d4f13a9842dd4fbef37bb57ce3a55f812b..95de8d1eb34c3267691c8c54924e44c58759098e 100644 (file)
--- a/qt/qtr.pro
+++ b/qt/qtr.pro
@@ -49,6 +49,7 @@ TRANSLATIONS += translations/transmission_en.ts \
 FORMS += about.ui \
          details.ui \
          mainwin.ui \
+         relocate.ui \
          session-dialog.ui \
          stats-dialog.ui
 RESOURCES += application.qrc

diff --git a/qt/relocate.cc b/qt/relocate.cc
index 5ce0e6371fb8de48484656931578fd965fbaac54..09842a4096b590e436aa8ff1f6066fbe733ba704 100644 (file)
--- a/qt/relocate.cc
+++ b/qt/relocate.cc
@@ -7,19 +7,10 @@
  * $Id$
  */
 
-#include <QApplication>
-#include <QDialogButtonBox>
 #include <QDir>
 #include <QFileIconProvider>
-#include <QLabel>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QSet>
-#include <QStyle>
-#include <QVBoxLayout>
-#include <QWidget>
-
-#include "hig.h"
+#include <QFileInfo>
+
 #include "relocate.h"
 #include "session.h"
 #include "torrent.h"
@@ -32,14 +23,22 @@ void
 RelocateDialog::onSetLocation ()
 {
   mySession.torrentSetLocation (myIds, myPath, myMoveFlag);
-  deleteLater ();
+  close ();
 }
 
 void
 RelocateDialog::onFileSelected (const QString& path)
 {
   myPath = path;
-  myDirButton->setText (myPath);
+
+  const QFileInfo pathInfo (path);
+  const QFileIconProvider iconProvider;
+
+  ui.newLocationButton->setIcon (mySession.isLocal () ?
+                                 iconProvider.icon (pathInfo) :
+                                 iconProvider.icon (QFileIconProvider::Folder));
+  ui.newLocationButton->setText (pathInfo.baseName ());
+  ui.newLocationButton->setToolTip (path);
 }
 
 void
@@ -58,26 +57,19 @@ RelocateDialog::onMoveToggled (bool b)
   myMoveFlag = b;
 }
 
-RelocateDialog::RelocateDialog (Session          & session,
-                                TorrentModel     & model,
-                                const QSet<int>  & ids,
-                                QWidget          * parent):
+RelocateDialog::RelocateDialog (Session            & session,
+                                const TorrentModel & model,
+                                const QSet<int>    & ids,
+                                QWidget            * parent):
   QDialog (parent),
   mySession (session),
-  myModel (model),
   myIds (ids)
 {
-  const int iconSize (style ()->pixelMetric (QStyle::PM_SmallIconSize));
-  const QFileIconProvider iconProvider;
-  const QIcon folderIcon = iconProvider.icon (QFileIconProvider::Folder);
-  const QPixmap folderPixmap = folderIcon.pixmap (iconSize);
-
-  QRadioButton * find_rb;
-  setWindowTitle (tr ("Set Torrent Location"));
+  ui.setupUi (this);
 
   foreach (int id, myIds)
     {
-      const Torrent * tor = myModel.getTorrentFromId (id);
+      const Torrent * tor = model.getTorrentFromId (id);
 
       if (myPath.isEmpty ())
         {
@@ -89,29 +81,21 @@ RelocateDialog::RelocateDialog (Session          & session,
             myPath = QDir::homePath ();
           else
             myPath = QDir::rootPath ();
+          break;
         }
     }
 
-  HIG * hig = new HIG ();
-  hig->addSectionTitle (tr ("Set Location"));
-  hig->addRow (tr ("New &location:"), myDirButton = new QPushButton (folderPixmap, myPath));
-  hig->addWideControl (myMoveRadio = new QRadioButton (tr ("&Move from the current folder"), this));
-  hig->addWideControl (find_rb = new QRadioButton (tr ("Local data is &already there"), this));
-  hig->finish ();
+  onFileSelected (myPath);
 
   if (myMoveFlag)
-    myMoveRadio->setChecked (true);
+    ui.moveDataRadio->setChecked (true);
   else
-    find_rb->setChecked (true);
-
-  connect (myMoveRadio, SIGNAL (toggled (bool)), this, SLOT (onMoveToggled (bool)));
-  connect (myDirButton, SIGNAL (clicked (bool)), this, SLOT (onDirButtonClicked ()));
-
-  QLayout * layout = new QVBoxLayout (this);
-  layout->addWidget (hig);
-  QDialogButtonBox * buttons = new QDialogButtonBox (QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-  connect (buttons, SIGNAL (rejected ()), this, SLOT (deleteLater ()));
-  connect (buttons, SIGNAL (accepted ()), this, SLOT (onSetLocation ()));
-  layout->addWidget (buttons);
-  QWidget::setAttribute (Qt::WA_DeleteOnClose, true);
+    ui.findDataRadio->setChecked (true);
+
+  connect (ui.moveDataRadio, SIGNAL (toggled (bool)), this, SLOT (onMoveToggled (bool)));
+  connect (ui.newLocationButton, SIGNAL (clicked ()), this, SLOT (onDirButtonClicked ()));
+  connect (ui.dialogButtons, SIGNAL (rejected ()), this, SLOT (close ()));
+  connect (ui.dialogButtons, SIGNAL (accepted ()), this, SLOT (onSetLocation ()));
+
+  setAttribute (Qt::WA_DeleteOnClose, true);
 }

diff --git a/qt/relocate.h b/qt/relocate.h
index 9e21075adf9616a96cb81c4cfde22b7bb18f63d5..de68577f7b55ac2bccd7a365348da25374b7f99c 100644 (file)
--- a/qt/relocate.h
+++ b/qt/relocate.h
@@ -14,26 +14,18 @@
 #include <QSet>
 #include <QString>
 
-class QPushButton;
-class QRadioButton;
+#include "ui_relocate.h"
+
 class Session;
-class Torrent;
 class TorrentModel;
 
 class RelocateDialog: public QDialog
 {
     Q_OBJECT
 
-  private:
-    QString myPath;
-    static bool myMoveFlag;
-
-  private:
-    Session & mySession;
-    TorrentModel& myModel;
-    QSet<int> myIds;
-    QPushButton * myDirButton;
-    QRadioButton * myMoveRadio;
+  public:
+    RelocateDialog (Session&, const TorrentModel&, const QSet<int>& ids, QWidget * parent = 0);
+    ~RelocateDialog () {}
 
   private slots:
     void onFileSelected (const QString& path);
@@ -41,9 +33,13 @@ class RelocateDialog: public QDialog
     void onSetLocation ();
     void onMoveToggled (bool);
 
-  public:
-    RelocateDialog (Session&, TorrentModel&, const QSet<int>& ids, QWidget * parent = 0);
-    ~RelocateDialog () {}
+  private:
+    Session& mySession;
+    const QSet<int> myIds;
+    Ui::RelocateDialog ui;
+    QString myPath;
+
+    static bool myMoveFlag;
 };
 
 #endif

diff --git a/qt/relocate.ui b/qt/relocate.ui
new file mode 100644 (file)
index 0000000..08b38d3
--- /dev/null
+++ b/qt/relocate.ui
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RelocateDialog</class>
+ <widget class="QDialog" name="RelocateDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>225</width>
+    <height>155</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Set Torrent Location</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">[tr-style~=&quot;form-section&quot;]
+{
+  font-weight: bold;
+  margin-top: 12px;
+  margin-bottom: 1px;
+}
+[tr-style~=&quot;form-section&quot;][tr-style~=&quot;first&quot;]
+{
+  margin-top: 0;
+}
+[tr-style~=&quot;form-label&quot;]
+{
+  margin-left: 18px;
+}</string>
+  </property>
+  <layout class="QGridLayout" name="dialogLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="setLocationSectionLabel">
+     <property name="text">
+      <string>Set Location</string>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-section first</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="newLocationLabel">
+     <property name="text">
+      <string>New &amp;location:</string>
+     </property>
+     <property name="buddy">
+      <cstring>newLocationButton</cstring>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="newLocationButton">
+     <property name="styleSheet">
+      <string notr="true">text-align:left</string>
+     </property>
+     <property name="autoDefault">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QRadioButton" name="moveDataRadio">
+     <property name="text">
+      <string>&amp;Move from the current folder</string>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QRadioButton" name="findDataRadio">
+     <property name="text">
+      <string>Local data is &amp;already there</string>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="dialogButtons">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/qt/translations/transmission_en.ts b/qt/translations/transmission_en.ts
index 8a05f53ad56a75af7cd521325ef572d5d9f57c15..f4c8d1dd996aee67f89550feb6a37a0e9d63289b 100644 (file)
--- a/qt/translations/transmission_en.ts
+++ b/qt/translations/transmission_en.ts
@@ -10,7 +10,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2009,32 +2009,32 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/qt/translations/transmission_es.ts b/qt/translations/transmission_es.ts
index 2d8999c69c505586deb6f0923eeabb4ceadd22bd..b9655e96317aad4254eb256b97b80544ba051464 100644 (file)
--- a/qt/translations/transmission_es.ts
+++ b/qt/translations/transmission_es.ts
@@ -10,7 +10,7 @@
         <translation>Acerca de Transmission</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -2012,32 +2012,32 @@ Para agregar otro URL primario, agrueguelo después de una línea en blanco.</tr
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Seleccione localización</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Defina localización del torrent</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Definir localización</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation>Nueva &amp;localización:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>&amp;Mover del directorio actual</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>Los datos locales &amp;ya están ahí</translation>
     </message>

diff --git a/qt/translations/transmission_eu.ts b/qt/translations/transmission_eu.ts
index 5eadd9d26fdc521f355eb4e8b9e0691b6cab945a..8e00c08cdb04bc8901ca74383e10844f9f35d232 100644 (file)
--- a/qt/translations/transmission_eu.ts
+++ b/qt/translations/transmission_eu.ts
@@ -10,7 +10,7 @@
         <translation>Transmissioni buruz</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -2009,32 +2009,32 @@ Beste lehen URL bat gehitzeko, gehitu hura lerro huts baten ondoren.</translatio
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Hautatu Kokalekua</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Ezarri Torrentaren Kokalekua</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Ezarri Kokalekua</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation>&amp;Kokaleku berria:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>&amp;Mugitu oraingo agiritegitik</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>&amp;Tokiko datuak jadanik hor daude</translation>
     </message>

diff --git a/qt/translations/transmission_fr.ts b/qt/translations/transmission_fr.ts
index cf86422ef7bc839de69d4f39848838221d32074c..b9687ad4eecc09dfa0677a813623ef7df348816a 100644 (file)
--- a/qt/translations/transmission_fr.ts
+++ b/qt/translations/transmission_fr.ts
@@ -10,7 +10,7 @@
         <translation>Transmission</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -2009,32 +2009,32 @@ Pour ajouter une autre URL primaire, placez-la après une ligne vide.</translati
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Séléctionner l&apos;emplacement</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Définir l&apos;emplacement du torrent</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Définir l&apos;emplacement</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation>Nouvel emp&amp;lacement:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>&amp;Déplacer depuis le dossier courant</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>Les données locales sont &amp;déjà là</translation>
     </message>

diff --git a/qt/translations/transmission_hu.ts b/qt/translations/transmission_hu.ts
index 281cdc569b3448e3e2c9bdcd4cb246e9f7a7ab02..ace0351545417f09d8c820fe1c2fc45e38571a7d 100644 (file)
--- a/qt/translations/transmission_hu.ts
+++ b/qt/translations/transmission_hu.ts
@@ -10,7 +10,7 @@
         <translation>A Transmission-ről</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -1996,32 +1996,32 @@ Másik elsődleges URL-t új sorba írva adhatsz hozzá.</translation>
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Válaszd ki a mappát</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Válaszd ki a torrentet</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Válaszd ki a mappát</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation>Új &amp;hely:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>Áthelyezés a &amp;jelenlegi mappából</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>A letöltött adat &amp;már itt van</translation>
     </message>

diff --git a/qt/translations/transmission_kk.ts b/qt/translations/transmission_kk.ts
index bb350fb4961df00815c6b67aaa6d22df9999990c..477a40631ee8762a3de80691611b0544bf99785c 100644 (file)
--- a/qt/translations/transmission_kk.ts
+++ b/qt/translations/transmission_kk.ts
@@ -10,7 +10,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2010,32 +2010,32 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Торрент орналасуын көрсетіңіз</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Орналасуын көрсету</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>&amp;Ағымдағы бумадан жылжыту</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>Жергілікті мәліметтер ол жерде &amp;болып тұр</translation>
     </message>

diff --git a/qt/translations/transmission_lt.ts b/qt/translations/transmission_lt.ts
index f9d142ebd699931b7045b187d9c01e371a9b8bf1..c95fc38d3ef3a16442fd6e86ceb78b39e8309fc2 100644 (file)
--- a/qt/translations/transmission_lt.ts
+++ b/qt/translations/transmission_lt.ts
@@ -5,7 +5,7 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../about.cc" line="+35"/>
+        <location filename="../about.cc" line="+36"/>
         <source>&amp;License</source>
         <translation>&amp;Licencija</translation>
     </message>
@@ -2022,32 +2022,32 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+98"/>
+        <location filename="../relocate.ui" line="+72"/>
         <source>&amp;Move from the current folder</source>
         <translation>&amp;Perkelti iš dabartinio aplanko</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>Vietiniai duomenys jau yra &amp;ten</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="-33"/>
         <source>New &amp;location:</source>
         <translation>Nauja &amp;vieta:</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Parinkite vietą</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location filename="../relocate.ui" line="-10"/>
         <source>Set Location</source>
         <translation>Nustatyti vietą</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>Set Torrent Location</source>
         <translation>Torento vietos nustatymas</translation>
     </message>

diff --git a/qt/translations/transmission_pt_BR.ts b/qt/translations/transmission_pt_BR.ts
index 87bec34671d49f43e2489ff7a0feef5998c4433c..5fe68776b3be0cbc16a5e404f969fcc883a8763f 100644 (file)
--- a/qt/translations/transmission_pt_BR.ts
+++ b/qt/translations/transmission_pt_BR.ts
@@ -10,7 +10,7 @@
         <translation>Sobre o Transmission</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2010,32 +2010,32 @@ Adicione outra URL primária depois de uma linha em branco.</translation>
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Selecionar local</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Definir Local do Torrent</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Definir Local</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation>Novo local:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>Mover da pasta atual</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>Os dados locais já estão lá</translation>
     </message>

diff --git a/qt/translations/transmission_ru.ts b/qt/translations/transmission_ru.ts
index 62c287f14e569d23e1c9372c70438124981bcd12..d396666edd58b1061fcecf2140065f03c76d7057 100644 (file)
--- a/qt/translations/transmission_ru.ts
+++ b/qt/translations/transmission_ru.ts
@@ -10,7 +10,7 @@
         <translation>О программе &quot;Transmission&quot;</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2023,32 +2023,32 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Выберите местоположение</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Указать местоположение торрента</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Указать местоположение</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation>Новое &amp;местоположение:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>&amp;Переместить из текущей папки</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>&amp;Локальные данные уже там</translation>
     </message>

diff --git a/qt/translations/transmission_uk.ts b/qt/translations/transmission_uk.ts
index 749367f63b31365387bd34f37f7caff1e166b240..2c8e1253da73b2580c684be49f2a809eb86b22d3 100644 (file)
--- a/qt/translations/transmission_uk.ts
+++ b/qt/translations/transmission_uk.ts
@@ -10,7 +10,7 @@
         <translation>Про Transmission</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="+27"/>
+        <location filename="../about.cc" line="+28"/>
         <source>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Transmission %1&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -2023,32 +2023,32 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>RelocateDialog</name>
     <message>
-        <location filename="../relocate.cc" line="+48"/>
+        <location filename="../relocate.cc" line="+47"/>
         <source>Select Location</source>
         <translation>Обрати розташування</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location filename="../relocate.ui" line="+14"/>
         <source>Set Torrent Location</source>
         <translation>Встановити розташування торенту</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+25"/>
         <source>Set Location</source>
         <translation>Встановити розташування</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>New &amp;location:</source>
         <translation>Но&amp;ве розташування:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>&amp;Move from the current folder</source>
         <translation>&amp;Перенести зі старої теки у вказану</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>Local data is &amp;already there</source>
         <translation>&amp;Локальні дані вже перенесено</translation>
     </message>