Merge pull request #4199 from pejakm/popravke

Fix extraction of context messages from ui files + more disambiguations
This commit is contained in:
John Maguire 2014-02-08 15:17:58 +01:00
commit ef6d53c5ac
3 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
set (XGETTEXT_OPTIONS --qt --keyword=tr:1,2c --keyword=tr --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
--keyword=trUtf8 --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
--keyword=translate:2 --flag=translate:2:pass-c-format --flag=translate:2:pass-qt-format
--keyword=translate:2,3c --keyword=translate:2 --flag=translate:2:pass-c-format --flag=translate:2:pass-qt-format
--keyword=QT_TR_NOOP --flag=QT_TR_NOOP:1:pass-c-format --flag=QT_TR_NOOP:1:pass-qt-format
--keyword=QT_TRANSLATE_NOOP:2 --flag=QT_TRANSLATE_NOOP:2:pass-c-format --flag=QT_TRANSLATE_NOOP:2:pass-qt-format
--keyword=_ --flag=_:1:pass-c-format --flag=_:1:pass-qt-format

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Search</string>
<string comment="Global search settings dialog title.">Search</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">

View File

@ -223,7 +223,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
// Add tabs to the fancy tab widget
ui_->tabs->AddTab(global_search_view_, IconLoader::Load("search"),
tr("Search"));
tr("Search", "Global search settings dialog title."));
ui_->tabs->AddTab(library_view_, IconLoader::Load("folder-sound"),
tr("Library"));
ui_->tabs->AddTab(file_view_, IconLoader::Load("document-open"), tr("Files"));