]> granicus.if.org Git - transmission/commitdiff
Rework torrent creation dialog in Qt client to load from .ui
authorMike Gelfand <mikedld@mikedld.com>
Wed, 31 Dec 2014 22:27:46 +0000 (22:27 +0000)
committerMike Gelfand <mikedld@mikedld.com>
Wed, 31 Dec 2014 22:27:46 +0000 (22:27 +0000)
19 files changed:
qt/CMakeLists.txt
qt/mainwin.cc
qt/make-dialog.cc
qt/make-dialog.h
qt/make-dialog.ui [new file with mode: 0644]
qt/make-progress-dialog.ui [new file with mode: 0644]
qt/options.cc
qt/path-button.cc
qt/qtr.pro
qt/translations/transmission_en.ts
qt/translations/transmission_es.ts
qt/translations/transmission_eu.ts
qt/translations/transmission_fr.ts
qt/translations/transmission_hu.ts
qt/translations/transmission_kk.ts
qt/translations/transmission_lt.ts
qt/translations/transmission_pt_BR.ts
qt/translations/transmission_ru.ts
qt/translations/transmission_uk.ts

index 50a427fd772198dd828a310cf4dca7ecb84d7765..497d8dae0b9765b8365e9ace210c35005b1b530f 100644 (file)
@@ -108,6 +108,8 @@ tr_qt_wrap_ui(${PROJECT_NAME}_UI_SOURCES
     about.ui
     details.ui
     mainwin.ui
+    make-dialog.ui
+    make-progress-dialog.ui
     options.ui
     relocate.ui
     session-dialog.ui
index 8e7c0fc177817ec576211341d4b66085338c9644..68fe94b725c1c9516b758074c04128ec9a4094e7 100644 (file)
@@ -1100,6 +1100,7 @@ void
 TrMainWindow::newTorrent ()
 {
   MakeDialog * dialog = new MakeDialog (mySession, this);
+  dialog->setAttribute (Qt::WA_DeleteOnClose);
   dialog->show ();
 }
 
index 176507e6e24db0d702e6896a01e40fb394cd173b..950f988ea01406eb296d1ba7bbc045cff498387f 100644 (file)
  * $Id$
  */
 
-#include <cassert>
-#include <iostream>
-
-#include <QCheckBox>
-#include <QDialogButtonBox>
-#include <QFileDialog>
-#include <QFileIconProvider>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QList>
+#include <QDir>
+#include <QFileInfo>
 #include <QMimeData>
-#include <QPlainTextEdit>
-#include <QProgressBar>
 #include <QPushButton>
-#include <QRadioButton>
-#include <QSize>
-#include <QStyle>
 #include <QTimer>
-#include <QVBoxLayout>
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/makemeta.h>
 #include <libtransmission/utils.h>
 
 #include "formatter.h"
-#include "hig.h"
 #include "make-dialog.h"
 #include "session.h"
 #include "utils.h"
 
-/***
-****
-***/
+#include "ui_make-progress-dialog.h"
 
-void
-MakeDialog::onNewDialogDestroyed (QObject * o)
+namespace
 {
-  Q_UNUSED (o);
+  class MakeProgressDialog: public QDialog
+  {
+      Q_OBJECT
+
+    public:
+      MakeProgressDialog (Session& session, tr_metainfo_builder& builder, QWidget * parent = nullptr);
+
+    private slots:
+      void onButtonBoxClicked (QAbstractButton *);
+      void onProgress ();
+
+    private:
+      Session& mySession;
+      tr_metainfo_builder& myBuilder;
+      Ui::MakeProgressDialog ui;
+      QTimer myTimer;
+  };
+}
+
+MakeProgressDialog::MakeProgressDialog (Session& session, tr_metainfo_builder& builder, QWidget * parent):
+  QDialog (parent),
+  mySession (session),
+  myBuilder (builder)
+{
+  ui.setupUi (this);
+
+  connect (ui.dialogButtons, SIGNAL (clicked (QAbstractButton *)),
+           this, SLOT (onButtonBoxClicked (QAbstractButton *)));
+
+  connect (&myTimer, SIGNAL (timeout ()), this, SLOT (onProgress ()));
+  myTimer.start (100);
 
-  myTimer.stop ();
+  onProgress ();
 }
 
 void
-MakeDialog::onNewButtonBoxClicked (QAbstractButton * button)
+MakeProgressDialog::onButtonBoxClicked (QAbstractButton * button)
 {
-  switch (myNewButtonBox->standardButton (button))
+  switch (ui.dialogButtons->standardButton (button))
     {
       case QDialogButtonBox::Open:
-        mySession.addNewlyCreatedTorrent (myTarget, QFileInfo(QString::fromUtf8(myBuilder->top)).dir().path());
+        mySession.addNewlyCreatedTorrent (QString::fromUtf8 (myBuilder.outputFile),
+                                          QFileInfo (QString::fromUtf8 (myBuilder.top)).dir ().path ());
         break;
 
       case QDialogButtonBox::Abort:
-        myBuilder->abortFlag = true;
+        myBuilder.abortFlag = true;
         break;
 
       default: // QDialogButtonBox::Ok:
         break;
     }
 
-  myNewDialog->deleteLater ();
+  close ();
 }
 
 void
-MakeDialog::onProgress ()
+MakeProgressDialog::onProgress ()
 {
   // progress bar
-  const tr_metainfo_builder * b = myBuilder;
-  const double denom = b->pieceCount ? b->pieceCount : 1;
-  myNewProgress->setValue (static_cast<int> ((100.0 * b->pieceIndex) / denom));
+  const tr_metainfo_builder& b = myBuilder;
+  const double denom = b.pieceCount ? b.pieceCount : 1;
+  ui.progressBar->setValue (static_cast<int> ((100.0 * b.pieceIndex) / denom));
 
   // progress label
-  const QString top = QString::fromLocal8Bit (myBuilder->top);
-  const QString base (QFileInfo(top).completeBaseName());
+  const QString top = QString::fromUtf8 (b.top);
+  const QString base (QFileInfo (top).completeBaseName ());
   QString str;
-  if (!b->isDone)
+  if (!b.isDone)
     str = tr ("Creating \"%1\"").arg (base);
-  else if (b->result == TR_MAKEMETA_OK)
+  else if (b.result == TR_MAKEMETA_OK)
     str = tr ("Created \"%1\"!").arg (base);
-  else if (b->result == TR_MAKEMETA_URL)
-    str = tr ("Error: invalid announce URL \"%1\"").arg (QString::fromLocal8Bit (b->errfile));
-  else if (b->result == TR_MAKEMETA_CANCELLED)
+  else if (b.result == TR_MAKEMETA_URL)
+    str = tr ("Error: invalid announce URL \"%1\"").arg (QString::fromUtf8 (b.errfile));
+  else if (b.result == TR_MAKEMETA_CANCELLED)
     str = tr ("Cancelled");
-  else if (b->result == TR_MAKEMETA_IO_READ)
-    str = tr ("Error reading \"%1\": %2").arg (QString::fromLocal8Bit(b->errfile)).arg (QString::fromLocal8Bit(strerror(b->my_errno)));
-  else if (b->result == TR_MAKEMETA_IO_WRITE)
-    str = tr ("Error writing \"%1\": %2").arg (QString::fromLocal8Bit(b->errfile)).arg (QString::fromLocal8Bit(strerror(b->my_errno)));
-  myNewLabel->setText (str);
+  else if (b.result == TR_MAKEMETA_IO_READ)
+    str = tr ("Error reading \"%1\": %2").arg (QString::fromUtf8 (b.errfile)).
+                                          arg (QString::fromLocal8Bit (tr_strerror (b.my_errno)));
+  else if (b.result == TR_MAKEMETA_IO_WRITE)
+    str = tr ("Error writing \"%1\": %2").arg (QString::fromUtf8 (b.errfile)).
+                                          arg (QString::fromLocal8Bit (tr_strerror (b.my_errno)));
+  ui.progressLabel->setText (str);
 
   // buttons
-  (myNewButtonBox->button(QDialogButtonBox::Abort))->setEnabled (!b->isDone);
-  (myNewButtonBox->button(QDialogButtonBox::Ok))->setEnabled (b->isDone);
-  (myNewButtonBox->button(QDialogButtonBox::Open))->setEnabled (b->isDone && !b->result);
+  ui.dialogButtons->button (QDialogButtonBox::Abort)->setEnabled (!b.isDone);
+  ui.dialogButtons->button (QDialogButtonBox::Ok)->setEnabled (b.isDone);
+  ui.dialogButtons->button (QDialogButtonBox::Open)->setEnabled (b.isDone && b.result == TR_MAKEMETA_OK);
 }
 
+#include "make-dialog.moc"
+
+/***
+****
+***/
 
 void
 MakeDialog::makeTorrent ()
 {
-  if (!myBuilder)
+  if (myBuilder == nullptr)
     return;
 
   // get the tiers
   int tier = 0;
   QVector<tr_tracker_info> trackers;
-  foreach (QString line, myTrackerEdit->toPlainText().split("\n"))
+  foreach (QString line, ui.trackersEdit->toPlainText ().split ("\n"))
     {
       line = line.trimmed ();
       if (line.isEmpty ())
@@ -122,162 +141,44 @@ MakeDialog::makeTorrent ()
       else
         {
           tr_tracker_info tmp;
-          tmp.announce = tr_strdup (line.toUtf8().constData ());
+          tmp.announce = tr_strdup (line.toUtf8 ().constData ());
           tmp.tier = tier;
           trackers.append (tmp);
         }
     }
 
-  // pop up the dialog
-  QDialog * dialog = new QDialog (this);
-  dialog->setWindowTitle (tr ("New Torrent"));
-  myNewDialog = dialog;
-  QVBoxLayout * top = new QVBoxLayout (dialog);
-  top->addWidget( (myNewLabel = new QLabel));
-  top->addWidget( (myNewProgress = new QProgressBar));
-  QDialogButtonBox * buttons = new QDialogButtonBox (QDialogButtonBox::Ok
-                                                   | QDialogButtonBox::Open
-                                                   | QDialogButtonBox::Abort);
-  myNewButtonBox = buttons;
-  connect (buttons, SIGNAL(clicked(QAbstractButton*)),
-           this, SLOT(onNewButtonBoxClicked(QAbstractButton*)));
-  top->addWidget (buttons);
-  onProgress ();
-  dialog->show ();
-  connect (dialog, SIGNAL(destroyed(QObject*)),
-           this, SLOT(onNewDialogDestroyed(QObject*)));
-  myTimer.start (100);
-
   // the file to create
   const QString path = QString::fromUtf8 (myBuilder->top);
-  const QString torrentName = QFileInfo(path).completeBaseName() + ".torrent";
-  myTarget = QDir (myDestination).filePath (torrentName);
+  const QString torrentName = QFileInfo (path).completeBaseName () + ".torrent";
+  const QString target = QDir (ui.destinationButton->path ()).filePath (torrentName);
 
   // comment
   QString comment;
-  if (myCommentCheck->isChecked())
-    comment = myCommentEdit->text();
+  if (ui.commentCheck->isChecked ())
+    comment = ui.commentEdit->text ();
 
   // start making the torrent
-  tr_makeMetaInfo (myBuilder,
-                   myTarget.toUtf8().constData(),
-                   (trackers.isEmpty() ? NULL : trackers.data()),
-                   trackers.size(),
-                   (comment.isEmpty() ? NULL : comment.toUtf8().constData()),
-                   myPrivateCheck->isChecked());
+  tr_makeMetaInfo (myBuilder.get (),
+                   target.toUtf8 ().constData (),
+                   trackers.isEmpty () ? NULL : trackers.data (),
+                   trackers.size (),
+                   comment.isEmpty () ? NULL : comment.toUtf8 ().constData (),
+                   ui.privateCheck->isChecked ());
+
+  // pop up the dialog
+  MakeProgressDialog * dialog = new MakeProgressDialog (mySession, *myBuilder, this);
+  dialog->setAttribute (Qt::WA_DeleteOnClose);
+  dialog->open ();
 }
 
 /***
 ****
 ***/
 
-void
-MakeDialog::onFileClicked ()
-{
-  QFileDialog * d = new QFileDialog (this, tr ("Select File"));
-  d->setFileMode (QFileDialog::ExistingFile);
-  d->setAttribute (Qt::WA_DeleteOnClose);
-  connect (d, SIGNAL(filesSelected(QStringList)),
-           this, SLOT(onFileSelected(QStringList)));
-  d->show ();
-}
-void
-MakeDialog::onFileSelected (const QStringList& list)
-{
-  if (!list.empty ())
-    onFileSelected (list.front ());
-}
-void
-MakeDialog::onFileSelected (const QString& filename)
-{
-  myFile = Utils::removeTrailingDirSeparator (filename);
-  myFileButton->setText (QFileInfo(myFile).fileName());
-  onSourceChanged ();
-}
-
-void
-MakeDialog::onFolderClicked ()
-{
-  QFileDialog * d = new QFileDialog (this, tr ("Select Folder"));
-  d->setFileMode (QFileDialog::Directory);
-  d->setOption (QFileDialog::ShowDirsOnly);
-  d->setAttribute (Qt::WA_DeleteOnClose);
-  connect (d, SIGNAL(filesSelected(QStringList)),
-           this, SLOT(onFolderSelected(QStringList)));
-  d->show ();
-}
-
-void
-MakeDialog::onFolderSelected (const QStringList& list)
-{
-  if (!list.empty ())
-    onFolderSelected (list.front ());
-}
-
-void
-MakeDialog::onFolderSelected (const QString& filename)
-{
-  myFolder = Utils::removeTrailingDirSeparator (filename);
-  myFolderButton->setText (QFileInfo(myFolder).fileName());
-  onSourceChanged ();
-}
-
-void
-MakeDialog::onDestinationClicked ()
-{
-  QFileDialog * d = new QFileDialog (this, tr ("Select Folder"));
-  d->setFileMode (QFileDialog::Directory);
-  d->setOption (QFileDialog::ShowDirsOnly);
-  d->setAttribute (Qt::WA_DeleteOnClose);
-  connect (d, SIGNAL(filesSelected(QStringList)),
-           this, SLOT(onDestinationSelected(QStringList)));
-  d->show ();
-}
-void
-MakeDialog::onDestinationSelected (const QStringList& list)
-{
-  if (!list.empty ())
-    onDestinationSelected (list.front());
-}
-void
-MakeDialog::onDestinationSelected (const QString& filename)
-{
-  myDestination = Utils::removeTrailingDirSeparator (filename);
-  myDestinationButton->setText (QFileInfo(myDestination).fileName());
-}
-
-void
-MakeDialog::enableBuddyWhenChecked (QRadioButton * box, QWidget * buddy)
-{
-  connect (box, SIGNAL(toggled(bool)), buddy, SLOT(setEnabled(bool)));
-  buddy->setEnabled (box->isChecked ());
-}
-void
-MakeDialog::enableBuddyWhenChecked (QCheckBox * box, QWidget * buddy)
-{
-  connect (box, SIGNAL(toggled(bool)), buddy, SLOT(setEnabled(bool)));
-  buddy->setEnabled (box->isChecked ());
-}
-
 QString
 MakeDialog::getSource () const
 {
-  return myFileRadio->isChecked () ? myFile : myFolder;
-}
-
-void
-MakeDialog::onButtonBoxClicked (QAbstractButton * button)
-{
-  switch (myButtonBox->standardButton (button))
-    {
-      case QDialogButtonBox::Ok:
-        makeTorrent ();
-        break;
-
-      default: // QDialogButtonBox::Close:
-        deleteLater ();
-        break;
-    }
+  return (ui.sourceFileRadio->isChecked () ? ui.sourceFileButton : ui.sourceFolderButton)->path ();
 }
 
 /***
@@ -287,18 +188,14 @@ MakeDialog::onButtonBoxClicked (QAbstractButton * button)
 void
 MakeDialog::onSourceChanged ()
 {
-  if (myBuilder)
-    {
-      tr_metaInfoBuilderFree (myBuilder);
-      myBuilder = 0;
-    }
+  myBuilder.reset ();
 
   const QString filename = getSource ();
   if (!filename.isEmpty ())
-    myBuilder = tr_metaInfoBuilderCreate (filename.toUtf8().constData());
+    myBuilder.reset (tr_metaInfoBuilderCreate (filename.toUtf8 ().constData ()));
 
   QString text;
-  if (!myBuilder)
+  if (myBuilder == nullptr)
     {
       text = tr ("<i>No source selected<i>");
     }
@@ -313,116 +210,35 @@ MakeDialog::onSourceChanged ()
                .arg (Formatter::sizeToString (myBuilder->pieceSize));
     }
 
-  mySourceLabel->setText (text);
+  ui.sourceSizeLabel->setText (text);
 }
 
-
-// bah, there doesn't seem to be any cleaner way to override
-// QPlainTextEdit's default desire to be 12 lines tall
-class ShortPlainTextEdit: public QPlainTextEdit
-{
-  public:
-    virtual ~ShortPlainTextEdit () {}
-    ShortPlainTextEdit (QWidget * parent = 0): QPlainTextEdit(parent) {}
-    virtual QSize sizeHint  () const { return QSize (256, 50); }
-};
-
 MakeDialog::MakeDialog (Session& session, QWidget * parent):
   QDialog (parent, Qt::Dialog),
   mySession (session),
-  myBuilder (0)
+  myBuilder (nullptr, &tr_metaInfoBuilderFree)
 {
-  setAcceptDrops (true);
-
-  connect (&myTimer, SIGNAL(timeout()), this, SLOT(onProgress()));
-
-  setWindowTitle (tr ("New Torrent"));
-  QVBoxLayout * top = new QVBoxLayout (this);
-  top->setSpacing (HIG::PAD);
-
-  HIG * hig = new HIG;
-  hig->setContentsMargins (0, 0, 0, 0);
-  hig->addSectionTitle (tr ("Files"));
-
-    QFileIconProvider iconProvider;
-    const int iconSize (style()->pixelMetric (QStyle::PM_SmallIconSize));
-    const QIcon folderIcon = iconProvider.icon (QFileIconProvider::Folder);
-    const QPixmap folderPixmap = folderIcon.pixmap (iconSize);
-    QPushButton * b = new QPushButton;
-    b->setIcon (folderPixmap);
-    b->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
-    myDestination = QDir::homePath();
-    b->setText (myDestination);
-    connect (b, SIGNAL(clicked(bool)),
-             this, SLOT(onDestinationClicked()));
-    myDestinationButton = b;
-    hig->addRow (tr ("Sa&ve to:"), b);
-
-    myFolderRadio = new QRadioButton (tr ("Source F&older:"));
-    connect (myFolderRadio, SIGNAL(toggled(bool)),
-             this, SLOT(onSourceChanged()));
-    myFolderButton = new QPushButton;
-    myFolderButton->setIcon (folderPixmap);
-    myFolderButton->setText (tr ("(None)"));
-    myFolderButton->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
-    connect (myFolderButton, SIGNAL(clicked(bool)),
-             this, SLOT(onFolderClicked()));
-    hig->addRow (myFolderRadio, myFolderButton);
-    enableBuddyWhenChecked (myFolderRadio, myFolderButton);
-
-    const QIcon fileIcon = iconProvider.icon (QFileIconProvider::File);
-    const QPixmap filePixmap = fileIcon.pixmap (iconSize);
-    myFileRadio = new QRadioButton (tr ("Source &File:"));
-    myFileRadio->setChecked (true);
-    connect (myFileRadio, SIGNAL(toggled(bool)),
-             this, SLOT(onSourceChanged()));
-    myFileButton = new QPushButton;
-    myFileButton->setText (tr ("(None)"));
-    myFileButton->setIcon (filePixmap);
-    myFileButton->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
-    connect (myFileButton, SIGNAL(clicked(bool)),
-             this, SLOT(onFileClicked()));
-    hig->addRow (myFileRadio, myFileButton);
-    enableBuddyWhenChecked (myFileRadio, myFileButton);
-
-    mySourceLabel = new QLabel (this);
-    hig->addRow (tr (""), mySourceLabel);
-
-  hig->addSectionDivider ();
-  hig->addSectionTitle (tr ("Properties"));
-
-    hig->addWideControl (myTrackerEdit = new ShortPlainTextEdit);
-    const int height = fontMetrics().size (0, QString::fromUtf8("\n\n\n\n")).height ();
-    myTrackerEdit->setMinimumHeight (height);
-    hig->addTallRow (tr ("&Trackers:"), myTrackerEdit);
-    QLabel * l = new QLabel (tr ("To add a backup URL, add it on the line after the primary URL.\nTo add another primary URL, add it after a blank line."));
-    l->setAlignment (Qt::AlignLeft);
-    hig->addRow (tr (""), l);
-    myTrackerEdit->resize (500, height);
-
-    myCommentCheck = new QCheckBox (tr ("Co&mment"));
-    myCommentEdit = new QLineEdit ();
-    hig->addRow (myCommentCheck, myCommentEdit);
-    enableBuddyWhenChecked (myCommentCheck, myCommentEdit);
-
-    myPrivateCheck = hig->addWideCheckBox (tr ("&Private torrent"), false);
-
-  hig->finish ();
-  top->addWidget (hig, 1);
-
-  myButtonBox = new QDialogButtonBox (QDialogButtonBox::Ok
-                                    | QDialogButtonBox::Close);
-  connect (myButtonBox, SIGNAL(clicked(QAbstractButton*)),
-           this, SLOT(onButtonBoxClicked(QAbstractButton*)));
-
-  top->addWidget (myButtonBox);
+  ui.setupUi (this);
+
+  ui.destinationButton->setMode (TrPathButton::DirectoryMode);
+  ui.destinationButton->setPath (QDir::homePath ());
+
+  ui.sourceFolderButton->setMode (TrPathButton::DirectoryMode);
+  ui.sourceFileButton->setMode (TrPathButton::FileMode);
+
+  connect (ui.sourceFolderRadio, SIGNAL (toggled (bool)), this, SLOT (onSourceChanged ()));
+  connect (ui.sourceFolderButton, SIGNAL (pathChanged (QString)), this, SLOT (onSourceChanged ()));
+  connect (ui.sourceFileRadio, SIGNAL (toggled (bool)), this, SLOT (onSourceChanged ()));
+  connect (ui.sourceFileButton, SIGNAL (pathChanged (QString)), this, SLOT (onSourceChanged ()));
+
+  connect (ui.dialogButtons, SIGNAL (accepted ()), this, SLOT (makeTorrent ()));
+  connect (ui.dialogButtons, SIGNAL (rejected ()), this, SLOT (close ()));
+
   onSourceChanged ();
 }
 
 MakeDialog::~MakeDialog ()
 {
-  if (myBuilder)
-    tr_metaInfoBuilderFree (myBuilder);
 }
 
 /***
@@ -434,27 +250,27 @@ MakeDialog::dragEnterEvent (QDragEnterEvent * event)
 {
   const QMimeData * mime = event->mimeData ();
 
-  if (mime->urls().size() && QFile(mime->urls().front().path()).exists ())
-    event->acceptProposedAction();
+  if (!mime->urls ().isEmpty () && QFileInfo (mime->urls ().front ().path ()).exists ())
+    event->acceptProposedAction ();
 }
 
 void
 MakeDialog::dropEvent (QDropEvent * event)
 {
-  const QString filename = event->mimeData()->urls().front().path();
+  const QString filename = event->mimeData ()->urls ().front ().path ();
   const QFileInfo fileInfo (filename);
 
   if (fileInfo.exists ())
     {
       if (fileInfo.isDir ())
         {
-          myFolderRadio->setChecked (true);
-          onFolderSelected (filename );
+          ui.sourceFolderRadio->setChecked (true);
+          ui.sourceFolderButton->setPath (filename);
         }
       else // it's a file
         {
-          myFileRadio->setChecked (true);
-          onFileSelected (filename);
+          ui.sourceFileRadio->setChecked (true);
+          ui.sourceFileButton->setPath (filename);
         }
     }
 }
index 494bab865e4cdd1c94819a23dc9c3153e1160774..8cb5f8e5f4270c73247be01feaa3af85e8ff370f 100644 (file)
 #ifndef MAKE_DIALOG_H
 #define MAKE_DIALOG_H
 
+#include <memory>
+
 #include <QDialog>
-#include <QTimer>
+
+#include "ui_make-dialog.h"
 
 class QAbstractButton;
-class QPlainTextEdit;
-class QLineEdit;
-class QCheckBox;
-class QLabel;
-class QPushButton;
-class QRadioButton;
+
 class Session;
-class QProgressBar;
-class QDialogButtonBox;
 
 extern "C"
 {
@@ -35,52 +31,15 @@ class MakeDialog: public QDialog
 
   private slots:
     void onSourceChanged ();
-    void onButtonBoxClicked (QAbstractButton*);
-    void onNewButtonBoxClicked (QAbstractButton*);
-    void onNewDialogDestroyed (QObject*);
-    void onProgress ();
-
-    void onFolderClicked ();
-    void onFolderSelected (const QString&);
-    void onFolderSelected (const QStringList&);
-
-    void onFileClicked ();
-    void onFileSelected (const QString&);
-    void onFileSelected (const QStringList&);
-
-    void onDestinationClicked ();
-    void onDestinationSelected (const QString&);
-    void onDestinationSelected (const QStringList&);
+    void makeTorrent ();
 
   private:
-    void makeTorrent ();
     QString getSource () const;
-    void enableBuddyWhenChecked (QCheckBox *, QWidget *);
-    void enableBuddyWhenChecked (QRadioButton *, QWidget *);
 
   private:
     Session& mySession;
-    QString myDestination;
-    QString myTarget;
-    QString myFile;
-    QString myFolder;
-    QTimer myTimer;
-    QRadioButton * myFolderRadio;
-    QRadioButton * myFileRadio;
-    QPushButton * myDestinationButton;
-    QPushButton * myFileButton;
-    QPushButton * myFolderButton;
-    QPlainTextEdit * myTrackerEdit;
-    QCheckBox * myCommentCheck;
-    QLineEdit * myCommentEdit;
-    QCheckBox * myPrivateCheck;
-    QLabel * mySourceLabel;
-    QDialogButtonBox * myButtonBox;
-    QProgressBar * myNewProgress;
-    QLabel * myNewLabel;
-    QDialogButtonBox * myNewButtonBox;
-    QDialog * myNewDialog;
-    tr_metainfo_builder * myBuilder;
+    Ui::MakeDialog ui;
+    std::unique_ptr<tr_metainfo_builder, void(*)(tr_metainfo_builder*)> myBuilder;
 
   protected:
     virtual void dragEnterEvent (QDragEnterEvent *);
@@ -88,7 +47,7 @@ class MakeDialog: public QDialog
 
   public:
     MakeDialog (Session&, QWidget * parent = 0);
-    ~MakeDialog ();
+    virtual ~MakeDialog ();
 };
 
 #endif
diff --git a/qt/make-dialog.ui b/qt/make-dialog.ui
new file mode 100644 (file)
index 0000000..ad86571
--- /dev/null
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MakeDialog</class>
+ <widget class="QDialog" name="MakeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>566</width>
+    <height>417</height>
+   </rect>
+  </property>
+  <property name="acceptDrops">
+   <bool>true</bool>
+  </property>
+  <property name="windowTitle">
+   <string>New Torrent</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">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="filesSectionLabel">
+     <property name="text">
+      <string>Files</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="destinationLabel">
+     <property name="text">
+      <string>Sa&amp;ve to:</string>
+     </property>
+     <property name="buddy">
+      <cstring>destinationButton</cstring>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="TrPathButton" name="destinationButton">
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonTextBesideIcon</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QRadioButton" name="sourceFolderRadio">
+     <property name="text">
+      <string>Source f&amp;older:</string>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="TrPathButton" name="sourceFolderButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonTextBesideIcon</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QRadioButton" name="sourceFileRadio">
+     <property name="text">
+      <string>Source &amp;file:</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="TrPathButton" name="sourceFileButton">
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonTextBesideIcon</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QLabel" name="sourceSizeLabel">
+     <property name="text">
+      <string notr="true">...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="propertiesSectionLabel">
+     <property name="text">
+      <string>Properties</string>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-section</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="trackersLabel">
+     <property name="text">
+      <string>&amp;Trackers:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="buddy">
+      <cstring>trackersEdit</cstring>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="QPlainTextEdit" name="trackersEdit">
+     <property name="tabChangesFocus">
+      <bool>true</bool>
+     </property>
+     <property name="lineWrapMode">
+      <enum>QPlainTextEdit::NoWrap</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <widget class="QLabel" name="trackersDescriptionLabel">
+     <property name="text">
+      <string>To add a backup URL, add it on the line after the primary URL.
+To add another primary URL, add it after a blank line.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="commentCheck">
+     <property name="text">
+      <string>Co&amp;mment:</string>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1">
+    <widget class="QLineEdit" name="commentEdit">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" colspan="2">
+    <widget class="QCheckBox" name="privateCheck">
+     <property name="text">
+      <string>&amp;Private torrent</string>
+     </property>
+     <property name="tr-style" stdset="0">
+      <string notr="true">form-label</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="dialogButtons">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>TrPathButton</class>
+   <extends>QToolButton</extends>
+   <header>path-button.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>commentCheck</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>commentEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>76</x>
+     <y>333</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>360</x>
+     <y>333</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sourceFolderRadio</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>sourceFolderButton</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>72</x>
+     <y>83</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>360</x>
+     <y>82</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sourceFileRadio</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>sourceFileButton</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>72</x>
+     <y>119</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>360</x>
+     <y>118</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/qt/make-progress-dialog.ui b/qt/make-progress-dialog.ui
new file mode 100644 (file)
index 0000000..ddc7002
--- /dev/null
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MakeProgressDialog</class>
+ <widget class="QDialog" name="MakeProgressDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>424</width>
+    <height>101</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>New Torrent</string>
+  </property>
+  <layout class="QVBoxLayout" name="dialogLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
+   <item>
+    <widget class="QLabel" name="progressLabel">
+     <property name="minimumSize">
+      <size>
+       <width>400</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true">...</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QProgressBar" name="progressBar"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="dialogButtons">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Abort|QDialogButtonBox::Ok|QDialogButtonBox::Open</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
index 18c8d8c0c6d74f81da194e734c17ac7f67f68dcf..e755ee03113e8da48e643a9be5d54bbcb8695920 100644 (file)
@@ -7,8 +7,6 @@
  * $Id$
  */
 
-#include <QFileDialog>
-#include <QFileIconProvider>
 #include <QFileInfo>
 #include <QPushButton>
 
index ea37f7bea7f4299141d0e4adcfff8dcbf63cbc80..278e58790fc0df735c9b89c0c77257c77517be1f 100644 (file)
@@ -22,6 +22,8 @@ TrPathButton::TrPathButton (QWidget * parent):
   myNameFilter (),
   myPath ()
 {
+  setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Fixed));
+
   updateAppearance ();
 
   connect (this, SIGNAL (clicked ()), this, SLOT (onClicked ()));
index 4ff70a0ad1b45d03190d983f2ff045bb0a53973a..6ca78e7e22ce6a2b623e7b34a0bf23fa8783535d 100644 (file)
@@ -49,6 +49,8 @@ TRANSLATIONS += translations/transmission_en.ts \
 FORMS += about.ui \
          details.ui \
          mainwin.ui \
+         make-dialog.ui \
+         make-progress-dialog.ui \
          options.ui \
          relocate.ui \
          session-dialog.ui \
index 87ce56a4cbaaf9d8b55f8dea9594c2626bf8986f..98e6706c82f6961a9ef64ff48363c69e85a8af67 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1424,7 +1414,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2384,7 +2374,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+401"/>
         <source>Torrent Files (*.torrent);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2399,7 +2389,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-897"/>
+        <location line="-898"/>
         <source>Speed Limits</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2426,7 +2416,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+132"/>
         <source>Remove torrent?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2524,7 +2514,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished"></translation>
     </message>
index 2f8395bd1f06e8b919504f7cf63f63e2ac5bfe17..0ded45f65e7dac33dcaa4f47fabe841dcba1e5ef 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>Creando &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>¡&quot;%1&quot; Creado!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Error: URL para anuncio invalido &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Cancelado</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>Error leyendo &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>Error escribiendo &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Nuevo torrent</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Seleccione archivo</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Seleccione folder</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;No se seleccionó la fuente&lt;i&gt;</translation>
     </message>
         <translation>%1 en %2; %3 @ %4</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Archivos</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>&amp;Guardar en:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
         <translation>&amp;Folder fuente:</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Ninguno)</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>&amp;Archivo fuente:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>&amp;Seguidores</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>Para agregar una URL de respaldo, agreguela en la línea siguiente al URL primario.
 Para agregar otro URL primario, agrueguelo después de una línea en blanco.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>Co&amp;mentario</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>Co&amp;mentario:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>Torrent &amp;Privado</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Nuevo torrent</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">Creando &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">¡&quot;%1&quot; Creado!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Error: URL para anuncio invalido &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Cancelado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Error leyendo &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Error escribiendo &quot;%1&quot;: %2</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1426,7 +1416,7 @@ Para agregar otro URL primario, agrueguelo después de una línea en blanco.</tr
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation>Abrir Torrent</translation>
     </message>
@@ -2390,7 +2380,7 @@ Para agregar otro URL primario, agrueguelo después de una línea en blanco.</tr
         <translation>Bajada: %1, Subida: %2</translation>
     </message>
     <message>
-        <location line="+398"/>
+        <location line="+399"/>
         <source>Open Torrent</source>
         <translation>Abrir Torrent</translation>
     </message>
@@ -2425,7 +2415,7 @@ Para agregar otro URL primario, agrueguelo después de una línea en blanco.</tr
         <translation>Archivos de torrent (*.torrent);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-        <location line="-899"/>
+        <location line="-900"/>
         <source>Speed Limits</source>
         <translation>Límites de velocidad</translation>
     </message>
@@ -2452,7 +2442,7 @@ Para agregar otro URL primario, agrueguelo después de una línea en blanco.</tr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Show &amp;options dialog</source>
         <translation>Mostar diálogo de &amp;opciones</translation>
     </message>
@@ -2530,7 +2520,7 @@ Para agregar otro URL primario, agrueguelo después de una línea en blanco.</tr
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Ninguno)</translation>
     </message>
index 31f74794e84d8e3e54b8367ed1966d8cfa669e92..0880d111a96e8062e4eb9305834158231bc57744 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>&quot;%1&quot; sortzen</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>&quot;%1&quot; sortuta!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Akatsa: iragarpen URL baliogabea &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Ezeztatuta</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>Akatsa irakurtzen &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>Akatsa idazten &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Torrent Berria</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Hautatu Agiria</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Hautatu Agiritegia</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Ez dago iturbururik hautatuta&lt;i&gt;</translation>
     </message>
         <translation>%1 -&gt; %2; %3 @ %4</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Agiriak</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>&amp;Gorde hemen:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
-        <translation>&amp;Iturburu Agiritegia:</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Ezer ez)</translation>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
+        <translation>&amp;Iturburu agiritegia:</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>I&amp;turburu Agiria:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Ezaugarriak</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>A&amp;ztarnariak:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>Babeskopia URL bat gehitzeko, gehitu hura lehen URL-aren ondorengo lerroan.
 Beste lehen URL bat gehitzeko, gehitu hura lerro huts baten ondoren.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>&amp;Aipamena</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>&amp;Aipamena:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>&amp;Torrent pribatua</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Torrent Berria</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">&quot;%1&quot; sortzen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">&quot;%1&quot; sortuta!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Akatsa: iragarpen URL baliogabea &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Ezeztatuta</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Akatsa irakurtzen &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Akatsa idazten &quot;%1&quot;: %2</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1424,7 +1414,7 @@ Beste lehen URL bat gehitzeko, gehitu hura lerro huts baten ondoren.</translatio
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation>Ireki Torrenta</translation>
     </message>
@@ -2384,7 +2374,7 @@ Beste lehen URL bat gehitzeko, gehitu hura lerro huts baten ondoren.</translatio
         <translation>Jeisketa: %1, Igoera: %2</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+401"/>
         <source>Torrent Files (*.torrent);;All Files (*.*)</source>
         <translation>Torrent Agiriak (*.torrent);;Agiri Guzitak (*.*)</translation>
     </message>
@@ -2399,7 +2389,7 @@ Beste lehen URL bat gehitzeko, gehitu hura lerro huts baten ondoren.</translatio
         <translation>Ireki Torrenta</translation>
     </message>
     <message>
-        <location line="-897"/>
+        <location line="-898"/>
         <source>Speed Limits</source>
         <translation>Abiadura Mugak</translation>
     </message>
@@ -2428,7 +2418,7 @@ Beste lehen URL bat gehitzeko, gehitu hura lerro huts baten ondoren.</translatio
  (%1 jeitsiera, %2 igoera)</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+132"/>
         <source>Remove torrent?</source>
         <translation>Kendu torrenta?</translation>
     </message>
@@ -2526,7 +2516,7 @@ Beste lehen URL bat gehitzeko, gehitu hura lerro huts baten ondoren.</translatio
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Ezer ez)</translation>
     </message>
index f7fab0f69aa46fbeee439ec87a9a1f2cfd53a085..4e4af4e7778a031f4701e9dd8e29eaf1388caa65 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>Création de &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>&quot;%1&quot; créé!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Erreur: URL d&apos;annonce invalide &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Annulé</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>Erreur de lecture &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>Erreur d&apos;écriture &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Nouveau Torrent</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Sélectionner le fichier</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Sélectionner le dossier</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Pas de source seléctionnée&lt;i&gt;</translation>
     </message>
         <translation>%1 sur %2; %3 @ %4</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>S&amp;auvegarder vers:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
         <translation>Répert&amp;oire source:</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Aucun)</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>&amp;Fichier source:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>&amp;Traqueurs:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>&quot;Pour ajouter une URL de secours, placez-la sur la ligne après l&apos;URL primaire.
 Pour ajouter une autre URL primaire, placez-la après une ligne vide.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>Co&amp;mmentaire</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>Co&amp;mmentaire:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>&amp;Torrent privé</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Nouveau Torrent</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">Création de &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">&quot;%1&quot; créé!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Erreur: URL d&apos;annonce invalide &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Annulé</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Erreur de lecture &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Erreur d&apos;écriture &quot;%1&quot;: %2</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1424,7 +1414,7 @@ Pour ajouter une autre URL primaire, placez-la après une ligne vide.</translati
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation>Ouvrir un torrent</translation>
     </message>
@@ -2391,7 +2381,7 @@ Pour ajouter une autre URL primaire, placez-la après une ligne vide.</translati
         <translation>Réception: %1, Envoi: %2</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+401"/>
         <source>Torrent Files (*.torrent);;All Files (*.*)</source>
         <translation>Fichiers Torrent (*.torrent);;Tous les fichiers (*.*)</translation>
     </message>
@@ -2406,7 +2396,7 @@ Pour ajouter une autre URL primaire, placez-la après une ligne vide.</translati
         <translation>Ouvrir un torrent</translation>
     </message>
     <message>
-        <location line="-447"/>
+        <location line="-448"/>
         <source>Network Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2430,7 +2420,7 @@ Pour ajouter une autre URL primaire, placez-la après une ligne vide.</translati
  (%1 down, %2 up)</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+132"/>
         <source>Remove torrent?</source>
         <translation>Enlever le torrent?</translation>
     </message>
@@ -2528,7 +2518,7 @@ Pour ajouter une autre URL primaire, placez-la après une ligne vide.</translati
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Aucun)</translation>
     </message>
index 75c34d9f83616f20021b362f107004cf505ab37f..de971e3b093fce8489c12c6fcadb55254f97a49e 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>&quot;%1&quot; létrehozás alatt</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>&quot;%1&quot; létrehozva!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Hibás announce URL: &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Megszakítva</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>&quot;%2&quot; hiba történt a(z) &quot;%1&quot; olvasásakor</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>&quot;%2&quot; hiba történt a(z) &quot;%1&quot; írásakor</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Új Torrent</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Fájl kiválasztása</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Mapp kiválasztása</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Nincs forrás kiválasztva&lt;i&gt;</translation>
     </message>
         <translation>%1 in %2; %3 @ %4</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Fájlok</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>Mentés &amp;ide:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
         <translation>Forrás&amp;mappa:</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Nincs)</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>&amp;Forrásfájl:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Tulajdonságok</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>&amp;Trackerek:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>Ha tartalék URL-t kívánsz hozzáadni írd azt az elsődleges után vele egy sorba.
 Másik elsődleges URL-t új sorba írva adhatsz hozzá.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>Megje&amp;gyzés</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>Megje&amp;gyzés:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>&amp;Privát torrent</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Új Torrent</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">&quot;%1&quot; létrehozás alatt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">&quot;%1&quot; létrehozva!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Hibás announce URL: &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Megszakítva</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">&quot;%2&quot; hiba történt a(z) &quot;%1&quot; olvasásakor</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">&quot;%2&quot; hiba történt a(z) &quot;%1&quot; írásakor</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1414,7 +1404,7 @@ Másik elsődleges URL-t új sorba írva adhatsz hozzá.</translation>
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation>Torrent megnyitása</translation>
     </message>
@@ -2371,7 +2361,7 @@ Másik elsődleges URL-t új sorba írva adhatsz hozzá.</translation>
         <translation>Le: %1, Fel: %2</translation>
     </message>
     <message>
-        <location line="+398"/>
+        <location line="+399"/>
         <source>Open Torrent</source>
         <translation>Torrent megnyitása</translation>
     </message>
@@ -2386,7 +2376,7 @@ Másik elsődleges URL-t új sorba írva adhatsz hozzá.</translation>
         <translation>&amp;Opciók ablak megjelenítése</translation>
     </message>
     <message>
-        <location line="-453"/>
+        <location line="-454"/>
         <source>Network Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2408,7 +2398,7 @@ Másik elsődleges URL-t új sorba írva adhatsz hozzá.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+132"/>
         <source>Remove torrent?</source>
         <translation>Valóban törölni kívánod a torrentet?</translation>
     </message>
@@ -2506,7 +2496,7 @@ Másik elsődleges URL-t új sorba írva adhatsz hozzá.</translation>
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Nincs)</translation>
     </message>
index 8ee9a9f86f7e9e4281bc6de56907346901a2a212..0a48a831772d473238e9ca42e1f0b45f4233d1b7 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>Жасалуда %1</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>Жасалды %1!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Қате: дүрыс емес анонс URL-ы %1</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Бас тартылды</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>&quot;%1&quot; оқу қатесі: %2</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>&quot;%1&quot; жазу қатесі: %2</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Жаңа торрент</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Файлдан жасау</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Бумадан жасау</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Көзі таңдалмаған&lt;/i&gt;</translation>
     </message>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Файлдар</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>Қа&amp;йда сақтау:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
         <translation>Бу&amp;мадан жасау:</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Ешнәрсе)</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>Фай&amp;лдан жасау:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Қасиеттері</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>&amp;Трекерлер:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>Қор URL-ын қосу үшін оны бастапқы URL жолынан кейін қосыңыз.
 Басқа бастапқы URL қосу үшін оны бір бос жолдан кейін қосыңыз.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>К&amp;омментарийі</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>К&amp;омментарийі:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>&amp;Жабық торрент</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Жаңа торрент</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">Жасалуда %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">Жасалды %1!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Қате: дүрыс емес анонс URL-ы %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Бас тартылды</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">&quot;%1&quot; оқу қатесі: %2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">&quot;%1&quot; жазу қатесі: %2</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1425,7 +1415,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2385,7 +2375,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation>Қабылданған: %1, Таратылған: %2</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+401"/>
         <source>Torrent Files (*.torrent);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2400,7 +2390,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-897"/>
+        <location line="-898"/>
         <source>Speed Limits</source>
         <translation type="unfinished">Жылдамдықты шектеу</translation>
     </message>
@@ -2427,7 +2417,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+132"/>
         <source>Remove torrent?</source>
         <translation>Торрентт(ерд)і өшіру керек пе?</translation>
     </message>
@@ -2525,7 +2515,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Ешнәрсе)</translation>
     </message>
index 6458e12f21a5ed8a600638a9620c855f50829d8b..3cd611541462d045596a92063f0c94960c08a946 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+309"/>
+        <location filename="../make-dialog.cc" line="+206"/>
         <source>%1 in %2; %3 @ %4</source>
         <translation>%1, %2; %3 po %4</translation>
     </message>
         </translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location filename="../make-dialog.ui" line="+177"/>
         <source>&amp;Private torrent</source>
         <translation>&amp;Privatus torentas</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-51"/>
         <source>&amp;Trackers:</source>
         <translation>&amp;Sekikliai:</translation>
     </message>
     <message>
-        <location line="-31"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Joks)</translation>
-    </message>
-    <message>
-        <location line="-77"/>
+        <location filename="../make-dialog.cc" line="-5"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Nepasirinktas šaltinis&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-211"/>
-        <source>Cancelled</source>
-        <translation>Atsisakyta</translation>
+        <location filename="../make-dialog.ui" line="+34"/>
+        <source>Co&amp;mment:</source>
+        <translation>&amp;Komentaras:</translation>
     </message>
     <message>
-        <location line="+311"/>
-        <source>Co&amp;mment</source>
-        <translation>&amp;Komentaras</translation>
+        <location line="-121"/>
+        <source>Files</source>
+        <translation>Failai</translation>
     </message>
     <message>
-        <location line="-315"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>Sukurtas „%1“!</translation>
+        <location line="-22"/>
+        <source>New Torrent</source>
+        <translation>Naujas torentas</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>Kuriamas „%1“</translation>
+        <location line="+99"/>
+        <source>Properties</source>
+        <translation>Savybės</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>Klaida skaitant „%1“: %2</translation>
+        <location line="-67"/>
+        <source>Sa&amp;ve to:</source>
+        <translation>Į&amp;rašyti į:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>Klaida rašant „%1“: %2</translation>
+        <location line="+40"/>
+        <source>Source &amp;file:</source>
+        <translation>Šaltinio &amp;failas:</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Klaida: netinkamas pranešimo URL „%1“</translation>
+        <location line="-20"/>
+        <source>Source f&amp;older:</source>
+        <translation>Šaltinio &amp;aplankas:</translation>
     </message>
     <message>
-        <location line="+255"/>
-        <source>Files</source>
-        <translation>Failai</translation>
+        <location line="+83"/>
+        <source>To add a backup URL, add it on the line after the primary URL.
+To add another primary URL, add it after a blank line.</source>
+        <translation>Atsarginį URL adresą veskite atskiroje eilutėje po pirminiu URL adresu.
+Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eilutę.</translation>
     </message>
+</context>
+<context>
+    <name>MakeProgressDialog</name>
     <message>
-        <location line="-212"/>
-        <location line="+206"/>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
         <source>New Torrent</source>
-        <translation>Naujas torentas</translation>
+        <translation type="unfinished">Naujas torentas</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Properties</source>
-        <translation>Savybės</translation>
-    </message>
-    <message>
-        <location line="-33"/>
-        <source>Sa&amp;ve to:</source>
-        <translation>Į&amp;rašyti į:</translation>
+        <location filename="../make-dialog.cc" line="-102"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">Kuriamas „%1“</translation>
     </message>
     <message>
-        <location line="-182"/>
-        <source>Select File</source>
-        <translation>Parinkite failą</translation>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">Sukurtas „%1“!</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Parinkite aplanką</translation>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Klaida: netinkamas pranešimo URL „%1“</translation>
     </message>
     <message>
-        <location line="+147"/>
-        <source>Source &amp;File:</source>
-        <translation>Šaltinio &amp;failas:</translation>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Atsisakyta</translation>
     </message>
     <message>
-        <location line="-14"/>
-        <source>Source F&amp;older:</source>
-        <translation>Šaltinio &amp;aplankas:</translation>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Klaida skaitant „%1“: %2</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>To add a backup URL, add it on the line after the primary URL.
-To add another primary URL, add it after a blank line.</source>
-        <translation>Atsarginį URL adresą veskite atskiroje eilutėje po pirminiu URL adresu.
-Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eilutę.</translation>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Klaida rašant „%1“: %2</translation>
     </message>
 </context>
 <context>
@@ -1439,7 +1429,7 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Paskirties &amp;aplankas:</translation>
     </message>
     <message>
-        <location filename="../options.cc" line="+115"/>
+        <location filename="../options.cc" line="+113"/>
         <source>&amp;Verify Local Data</source>
         <translation>Pa&amp;tikrinti turimus duomenis</translation>
     </message>
@@ -2363,7 +2353,7 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Ribojama iki %1</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+215"/>
         <source>Once removed, continuing the transfers will require the torrent files or magnet links.</source>
         <translation>Jeigu pašalinsite, norint tęsti siuntimus, jums prireiks atitinkamų torentų failų arba magnet nuorodų.</translation>
     </message>
@@ -2378,13 +2368,13 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Atverti torentą</translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <location line="+16"/>
         <source>Ratio: %1</source>
         <translation>Santykis: %1</translation>
     </message>
     <message>
-        <location line="+494"/>
+        <location line="+495"/>
         <source>Remove %1 torrents?</source>
         <translation>Pašalinti %1 torentus(-ų)?</translation>
     </message>
@@ -2419,22 +2409,22 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Šie torentai prisijungę prie siuntėjų.</translation>
     </message>
     <message>
-        <location line="-819"/>
+        <location line="-820"/>
         <source>Seed Forever</source>
         <translation>Skleisti visada</translation>
     </message>
     <message>
-        <location line="+699"/>
+        <location line="+700"/>
         <source>Show &amp;options dialog</source>
         <translation>Rodyti &amp;parinkčių langą</translation>
     </message>
     <message>
-        <location line="-477"/>
+        <location line="-478"/>
         <source> - %1:%2</source>
         <translation> - %1:%2</translation>
     </message>
     <message>
-        <location line="+578"/>
+        <location line="+579"/>
         <source>Delete these %1 torrents&apos; downloaded files?</source>
         <translation>Pašalinti šių %1 torentų atsiųstus failus?</translation>
     </message>
@@ -2444,7 +2434,7 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Pašalinti šio torento atsiųstus failus?</translation>
     </message>
     <message>
-        <location line="-1003"/>
+        <location line="-1004"/>
         <source>Speed Limits</source>
         <translation type="unfinished">Greičio ribojimai</translation>
     </message>
@@ -2477,7 +2467,7 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+145"/>
         <source>Once removed, continuing the transfer will require the torrent file or magnet link.</source>
         <translation>Jeigu pašalinsite, norint tęsti siuntimą, jums prireiks torento failo arba magnet nuorodos.</translation>
     </message>
@@ -2487,7 +2477,7 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Vienas šių torentų dar neatsiųstas.</translation>
     </message>
     <message>
-        <location line="-842"/>
+        <location line="-843"/>
         <source>Stop Seeding at Ratio</source>
         <translation>Nebeskleisti esant santykiui</translation>
     </message>
@@ -2498,7 +2488,7 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Nebeskleisti esant santykiui (%1)</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+213"/>
         <source>These torrents have not finished downloading.</source>
         <translation>Šie torentai dar neatsiųsti.</translation>
     </message>
@@ -2508,13 +2498,13 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
         <translation>Šis torentas dar neatsiųstas.</translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-858"/>
         <location line="+22"/>
         <source>Unlimited</source>
         <translation>Be ribojimų</translation>
     </message>
     <message>
-        <location line="+920"/>
+        <location line="+921"/>
         <source>%1 has not responded yet</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2542,7 +2532,7 @@ Papildomą pirminį URL adresą galite įvesti, palikę prieš jį tuščią eil
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Joks)</translation>
     </message>
index 7f4b8bf9bf905ac189c8b5e5e0d7b07b35197ec5..771c517df17ee40355ced22421d6282b938f6462 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>Criando &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>&quot;%1&quot; Criado!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Erro: URL de anúncio inválida &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Cancelado</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>Erro na leitura de &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>Erro na gravação de &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Novo Torrent</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Selecionar Arquivo</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Selecionar Pasta</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Nenhuma fonte selecionada&lt;i&gt;</translation>
     </message>
         <translation>%1 em %2; %3 @ %4</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Arquivos</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>Salvar em:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
-        <translation>Pasta Fonte:</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Nenhuma)</translation>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
+        <translation>Pasta fonte:</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>Arquivo Fonte:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>Rastreadores:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>Adicione uma URL reserva na linha após a primária.
 Adicione outra URL primária depois de uma linha em branco.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>Comentário</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>Comentário:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>Torrent Privado</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Novo Torrent</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">Criando &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">&quot;%1&quot; Criado!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Erro: URL de anúncio inválida &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Cancelado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Erro na leitura de &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Erro na gravação de &quot;%1&quot;: %2</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1425,7 +1415,7 @@ Adicione outra URL primária depois de uma linha em branco.</translation>
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2385,7 +2375,7 @@ Adicione outra URL primária depois de uma linha em branco.</translation>
         <translation>Baixado: %1 - Enviado: %2</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+401"/>
         <source>Torrent Files (*.torrent);;All Files (*.*)</source>
         <translation>Arquivos Torrent (*.torrent);;Todos os Arquivos (*.*)</translation>
     </message>
@@ -2400,7 +2390,7 @@ Adicione outra URL primária depois de uma linha em branco.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-897"/>
+        <location line="-898"/>
         <source>Speed Limits</source>
         <translation type="unfinished">Limites de Velocidade</translation>
     </message>
@@ -2427,7 +2417,7 @@ Adicione outra URL primária depois de uma linha em branco.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+132"/>
         <source>Remove torrent?</source>
         <translation>Remover torrent?</translation>
     </message>
@@ -2525,7 +2515,7 @@ Adicione outra URL primária depois de uma linha em branco.</translation>
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Nenhuma)</translation>
     </message>
index 961c025619dff003b97fcb263902e9d1a6c79b89..85a0ecc79a81ed08d4ca8d339176e36566367191 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>Создание &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>Создан &quot;%1&quot;!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Ошибка: неверный URL-адрес объявлений &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Отменено</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>Ошибка чтения &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>Ошибка записи &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Создание нового торрента</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Выбор файла</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Выбор папки</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Не выбраны исходные данные&lt;i&gt;</translation>
     </message>
         <translation>%1 в %2; %3 @ %4</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Файлы</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>&amp;Сохранить в папку:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
         <translation>Исходный к&amp;аталог:</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Не выбран)</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>&amp;Исходный файл:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>&amp;Трекеры:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>Чтобы добавить резервный URL, добавьте его после основного URL в той же строке.
 Чтобы добавить ещё один основной URL, добавьте его в новой строке.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>&amp;Комментарий</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>&amp;Комментарий:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>&amp;Закрытый торрент</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Создание нового торрента</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">Создание &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">Создан &quot;%1&quot;!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Ошибка: неверный URL-адрес объявлений &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Отменено</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Ошибка чтения &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Ошибка записи &quot;%1&quot;: %2</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1435,7 +1425,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation>Открытие файла</translation>
     </message>
@@ -2403,12 +2393,12 @@ To add another primary URL, add it after a blank line.</source>
         <translation>Принято: %1, Роздано: %2</translation>
     </message>
     <message>
-        <location line="+398"/>
+        <location line="+399"/>
         <source>Open Torrent</source>
         <translation>Открытие файла</translation>
     </message>
     <message>
-        <location line="-897"/>
+        <location line="-898"/>
         <source>Speed Limits</source>
         <translation type="unfinished">Ограничения скорости</translation>
     </message>
@@ -2435,7 +2425,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Torrent Files (*.torrent);;All Files (*.*)</source>
         <translation>Торрент-файлы (*.torrent);;Все файлы (*.*)</translation>
     </message>
@@ -2543,7 +2533,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Не выбран)</translation>
     </message>
index 1f37bb4bbf70704e9436efd6a011607f910e6578..1156ed47185ecc86b79f3cae6c695b070b99696a 100644 (file)
 <context>
     <name>MakeDialog</name>
     <message>
-        <location filename="../make-dialog.cc" line="+86"/>
-        <source>Creating &quot;%1&quot;</source>
-        <translation>Створюється «%1»</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Created &quot;%1&quot;!</source>
-        <translation>«%1» створено!</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error: invalid announce URL &quot;%1&quot;</source>
-        <translation>Помилка: пошкоджена адреса оголошень «%1»</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cancelled</source>
-        <translation>Скасовано</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error reading &quot;%1&quot;: %2</source>
-        <translation>Не вдалося прочитати «%1»: %2</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Error writing &quot;%1&quot;: %2</source>
-        <translation>Не вдалося записати «%1»: %2</translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <location line="+206"/>
+        <location filename="../make-dialog.ui" line="+17"/>
         <source>New Torrent</source>
         <translation>Новий торент</translation>
     </message>
     <message>
-        <location line="-162"/>
-        <source>Select File</source>
-        <translation>Обрати файл</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <location line="+27"/>
-        <source>Select Folder</source>
-        <translation>Обрати теку</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location filename="../make-dialog.cc" line="+200"/>
         <source>&lt;i&gt;No source selected&lt;i&gt;</source>
         <translation>&lt;i&gt;Не вказано джерела&lt;i&gt;</translation>
     </message>
         <translation>%1 у %2; %3 @ %4</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location filename="../make-dialog.ui" line="+22"/>
         <source>Files</source>
         <translation>Файли</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+10"/>
         <source>Sa&amp;ve to:</source>
         <translation>З&amp;берегти до:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source F&amp;older:</source>
+        <location line="+20"/>
+        <source>Source f&amp;older:</source>
         <translation>Тека з &amp;даними:</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+14"/>
-        <source>(None)</source>
-        <translation>(Нічого)</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Source &amp;File:</source>
+        <location line="+20"/>
+        <source>Source &amp;file:</source>
         <translation>&amp;Файл даних:</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+27"/>
         <source>Properties</source>
         <translation>Властивості</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+10"/>
         <source>&amp;Trackers:</source>
         <translation>&amp;Трекери:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+26"/>
         <source>To add a backup URL, add it on the line after the primary URL.
 To add another primary URL, add it after a blank line.</source>
         <translation>Резервну адресу додавайте після основної.
 Щоб додати нову основну адресу, допишіть її після порожнього рядка.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Co&amp;mment</source>
-        <translation>Ком&amp;ентар</translation>
+        <location line="+8"/>
+        <source>Co&amp;mment:</source>
+        <translation>Ком&amp;ентар:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+17"/>
         <source>&amp;Private torrent</source>
         <translation>&amp;Приватний торент</translation>
     </message>
 </context>
+<context>
+    <name>MakeProgressDialog</name>
+    <message>
+        <location filename="../make-progress-dialog.ui" line="+14"/>
+        <source>New Torrent</source>
+        <translation type="unfinished">Новий торент</translation>
+    </message>
+    <message>
+        <location filename="../make-dialog.cc" line="-108"/>
+        <source>Creating &quot;%1&quot;</source>
+        <translation type="unfinished">Створюється «%1»</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Created &quot;%1&quot;!</source>
+        <translation type="unfinished">«%1» створено!</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error: invalid announce URL &quot;%1&quot;</source>
+        <translation type="unfinished">Помилка: пошкоджена адреса оголошень «%1»</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Скасовано</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Error reading &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Не вдалося прочитати «%1»: %2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error writing &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Не вдалося записати «%1»: %2</translation>
+    </message>
+</context>
 <context>
     <name>MyApp</name>
     <message>
@@ -1435,7 +1425,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>OptionsDialog</name>
     <message>
-        <location filename="../options.cc" line="+59"/>
+        <location filename="../options.cc" line="+57"/>
         <source>Open Torrent</source>
         <translation>Відкрити торент</translation>
     </message>
@@ -2403,7 +2393,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation>Завн: %1, Пошир: %2</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+401"/>
         <source>Torrent Files (*.torrent);;All Files (*.*)</source>
         <translation>Торент файли (*.torrent);;Всі файли (*.*)</translation>
     </message>
@@ -2418,7 +2408,7 @@ To add another primary URL, add it after a blank line.</source>
         <translation>Відкрити торент</translation>
     </message>
     <message>
-        <location line="-897"/>
+        <location line="-898"/>
         <source>Speed Limits</source>
         <translation>Обмеження швидкості</translation>
     </message>
@@ -2447,7 +2437,7 @@ To add another primary URL, add it after a blank line.</source>
 (%1 завантаження, %2 поширення)</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+132"/>
         <source>Remove torrent?</source>
         <translation>Вилучити торент?</translation>
     </message>
@@ -2545,7 +2535,7 @@ To add another primary URL, add it after a blank line.</source>
 <context>
     <name>TrPathButton</name>
     <message>
-        <location filename="../path-button.cc" line="+111"/>
+        <location filename="../path-button.cc" line="+113"/>
         <source>(None)</source>
         <translation type="unfinished">(Нічого)</translation>
     </message>