diff --git a/src/httpconnection.cpp b/src/httpconnection.cpp index 6255cc162..5dba3d391 100644 --- a/src/httpconnection.cpp +++ b/src/httpconnection.cpp @@ -109,7 +109,7 @@ QString HttpConnection::translateDocument(QString data) { bool found = false; do { found = false; - QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),µ\\-\\.]+)\\)")); + QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),µ&\\-\\.]+)\\)")); i = regex.indexIn(data, i); if(i >= 0) { //qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data()); @@ -120,6 +120,8 @@ QString HttpConnection::translateDocument(QString data) { translation = qApp->translate(contexts[context_index].c_str(), word.toLocal8Bit().constData(), 0, QCoreApplication::UnicodeUTF8, 1); ++context_index; }while(translation == word && context_index < 13); + // Remove keyboard shortcuts + translation = translation.replace("&", ""); //qDebug("Translation is %s", translation.toUtf8().data()); data = data.replace(i, regex.matchedLength(), translation); i += translation.length(); diff --git a/src/lang/qbittorrent_fr.qm b/src/lang/qbittorrent_fr.qm index 9b8f90811..84cabe51f 100644 Binary files a/src/lang/qbittorrent_fr.qm and b/src/lang/qbittorrent_fr.qm differ diff --git a/src/lang/qbittorrent_fr.ts b/src/lang/qbittorrent_fr.ts index 0e2a12522..af3d714a3 100644 --- a/src/lang/qbittorrent_fr.ts +++ b/src/lang/qbittorrent_fr.ts @@ -3816,7 +3816,7 @@ Ce message d'avertissement ne sera plus affiché. S&tart All - Tout déma&rrrer + Tout déma&rrer diff --git a/src/webui/index.html b/src/webui/index.html index d6138694a..3e28d20a8 100644 --- a/src/webui/index.html +++ b/src/webui/index.html @@ -35,36 +35,36 @@
  • _(File)
  • _(Edit)
  • - _(Options) + _(&Tools)
  • - _(Help) + _(&Help)
    • diff --git a/src/webui/preferences.html b/src/webui/preferences.html index 2093d6688..a231837eb 100644 --- a/src/webui/preferences.html +++ b/src/webui/preferences.html @@ -17,7 +17,7 @@ - +
    diff --git a/src/webui/preferences_content.html b/src/webui/preferences_content.html index 9852d3e6e..bc5ce33ec 100644 --- a/src/webui/preferences_content.html +++ b/src/webui/preferences_content.html @@ -32,7 +32,7 @@
    - _(Global bandwidth limiting) + _(Global speed limits)
    @@ -98,15 +98,15 @@
    - + - + - + - +
    _(Destination Folder:)_(Save files to location:)
    _(Use a different folder for incomplete downloads:)_(Keep incomplete torrents in:)
    _(Check Folders for .torrent Files:)
    _(Automatically add torrents from:)
    @@ -127,7 +127,7 @@ _(Append .!qB extension to incomplete files)
    _(Pre-allocate all files)_(Pre-allocate disk space for all files)
    @@ -137,7 +137,7 @@
    - + @@ -154,9 +154,9 @@
    _(Enable queueing system)_(Torrent queueing)
    _(Maximum active downloads:)
    @@ -206,7 +206,7 @@
    _(Filter path (.dat, .p2p, .p2b):)
    diff --git a/src/webui/scripts/mocha-init.js b/src/webui/scripts/mocha-init.js index 3888b32b6..22dff6dd1 100644 --- a/src/webui/scripts/mocha-init.js +++ b/src/webui/scripts/mocha-init.js @@ -41,7 +41,7 @@ initializeWindows = function(){ new Event(e).stop(); new MochaUI.Window({ id: 'preferencesPage', - title: "_(Preferences)", + title: "_(Options)", loadMethod: 'xhr', toolbar: true, contentURL: 'preferences_content.html',