1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Fixed crash upon closing private browsing window.

Also updated translations for previous commits.
This commit is contained in:
nowrep 2013-04-16 10:00:18 +02:00
parent b6f4aed233
commit ee42199669
2 changed files with 28 additions and 30 deletions

View File

@ -747,7 +747,10 @@ void MainApplication::quitApplication()
// //
// * this can occur on Mac OS (see #157) // * this can occur on Mac OS (see #157)
if (!m_isPrivateSession) {
removeLockFile(); removeLockFile();
}
quit(); quit();
} }

View File

@ -2199,22 +2199,22 @@
<context> <context>
<name>MainApplication</name> <name>MainApplication</name>
<message> <message>
<location filename="../src/lib/app/mainapplication.cpp" line="959"/> <location filename="../src/lib/app/mainapplication.cpp" line="962"/>
<source>QupZilla is not currently your default browser. Would you like to make it your default browser?</source> <source>QupZilla is not currently your default browser. Would you like to make it your default browser?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/mainapplication.cpp" line="960"/> <location filename="../src/lib/app/mainapplication.cpp" line="963"/>
<source>Always perform this check when starting QupZilla.</source> <source>Always perform this check when starting QupZilla.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/mainapplication.cpp" line="962"/> <location filename="../src/lib/app/mainapplication.cpp" line="965"/>
<source>Default Browser</source> <source>Default Browser</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/mainapplication.cpp" line="982"/> <location filename="../src/lib/app/mainapplication.cpp" line="985"/>
<source>QupZilla is a new, fast and secure open-source WWW browser. QupZilla is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework.</source> <source>QupZilla is a new, fast and secure open-source WWW browser. QupZilla is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -3984,12 +3984,7 @@
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="563"/> <location filename="../src/lib/app/qupzilla.cpp" line="563"/>
<source>&amp;Private Browsing</source> <source>New &amp;Private Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/lib/app/qupzilla.cpp" line="563"/>
<source>New &amp;Private Browsing Window</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -4018,82 +4013,82 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="652"/> <location filename="../src/lib/app/qupzilla.cpp" line="653"/>
<source>Restore &amp;Closed Tab</source> <source>Restore &amp;Closed Tab</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="921"/> <location filename="../src/lib/app/qupzilla.cpp" line="922"/>
<source> (Private Browsing)</source> <source> (Private Browsing)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1033"/> <location filename="../src/lib/app/qupzilla.cpp" line="1034"/>
<location filename="../src/lib/app/qupzilla.cpp" line="1063"/> <location filename="../src/lib/app/qupzilla.cpp" line="1064"/>
<location filename="../src/lib/app/qupzilla.cpp" line="1122"/> <location filename="../src/lib/app/qupzilla.cpp" line="1123"/>
<location filename="../src/lib/app/qupzilla.cpp" line="1151"/> <location filename="../src/lib/app/qupzilla.cpp" line="1152"/>
<location filename="../src/lib/app/qupzilla.cpp" line="1176"/> <location filename="../src/lib/app/qupzilla.cpp" line="1177"/>
<source>Empty</source> <source>Empty</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1125"/> <location filename="../src/lib/app/qupzilla.cpp" line="1126"/>
<source>Restore All Closed Tabs</source> <source>Restore All Closed Tabs</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1126"/> <location filename="../src/lib/app/qupzilla.cpp" line="1127"/>
<source>Clear list</source> <source>Clear list</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1252"/> <location filename="../src/lib/app/qupzilla.cpp" line="1253"/>
<source>Other</source> <source>Other</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1684"/> <location filename="../src/lib/app/qupzilla.cpp" line="1685"/>
<source>%1 - QupZilla</source> <source>%1 - QupZilla</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1778"/> <location filename="../src/lib/app/qupzilla.cpp" line="1779"/>
<source>HTML files</source> <source>HTML files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1778"/> <location filename="../src/lib/app/qupzilla.cpp" line="1779"/>
<source>Image files</source> <source>Image files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1778"/> <location filename="../src/lib/app/qupzilla.cpp" line="1779"/>
<source>Text files</source> <source>Text files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1778"/> <location filename="../src/lib/app/qupzilla.cpp" line="1779"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="1780"/> <location filename="../src/lib/app/qupzilla.cpp" line="1781"/>
<source>Open file...</source> <source>Open file...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="2142"/> <location filename="../src/lib/app/qupzilla.cpp" line="2143"/>
<source>There are still %1 open tabs and your session won&apos;t be stored. <source>There are still %1 open tabs and your session won&apos;t be stored.
Are you sure to quit QupZilla?</source> Are you sure to quit QupZilla?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="2143"/> <location filename="../src/lib/app/qupzilla.cpp" line="2144"/>
<source>Don&apos;t ask again</source> <source>Don&apos;t ask again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/lib/app/qupzilla.cpp" line="2144"/> <location filename="../src/lib/app/qupzilla.cpp" line="2145"/>
<source>There are still open tabs</source> <source>There are still open tabs</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>