Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Merge branch 'master' of github.com:QupZilla/qupzilla

Browse Source
This commit is contained in:
nowrep 2012-09-08 19:29:05 +02:00
commit de6ce70038
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/app/qupzilla.cpp
View File

@ -1868,7 +1868,7 @@ bool QupZilla::restoreState(const QByteArray &state, int version)
return QMainWindow::restoreState(windowState, version);
#else
return QMainWindow::restoreState(windowState, version);
return QMainWindow::restoreState(state, version);
#endif
}

2
src/plugins/PIM/PIM_plugin.cpp
View File

@ -69,7 +69,7 @@ bool PIM_Plugin::testPlugin()
QTranslator* PIM_Plugin::getTranslator(const QString &locale)
{
QTranslator* translator = new QTranslator();
QTranslator* translator = new QTranslator(this);
translator->load(locale, ":/PIM/locale/");
return translator;
}

2
translations/de_DE.ts
View File

@ -2583,7 +2583,7 @@
<message>
<location filename="../src/lib/preferences/preferences.ui" line="666"/>
<source>Show close button on tabs</source>
<translation type="unfinished"></translation>
<translation>Schließen-Schaltfläche auf Tabs anzeigen</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="694"/>