Fix commit 83e931766f (wrong conflict resolution).

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"))