From 46a355675e22d8283a7474fb8defeed61594c980 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sat, 5 Mar 2016 19:49:15 +0200 Subject: [PATCH] Fix commit 83e931766f5c (wrong conflict resolution). --- src/gui/options_imp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/options_imp.cpp b/src/gui/options_imp.cpp index 1e11c4bc5..3293ded57 100644 --- a/src/gui/options_imp.cpp +++ b/src/gui/options_imp.cpp @@ -202,7 +202,7 @@ options_imp::options_imp(QWidget *parent) const QString autoRunStr = QString::fromUtf8("%1\n %2\n %3\n %4\n %5\n %6\n %7\n %8\n %9\n %10\n%11") .arg(tr("Supported parameters (case sensitive):")) .arg(tr("%N: Torrent name")) - .arg(tr("%L: Label")) + .arg(tr("%L: Category")) .arg(tr("%F: Content path (same as root path for multifile torrent)")) .arg(tr("%R: Root path (first torrent subdirectory path)")) .arg(tr("%D: Save path"))