diff options
| author | 2015-05-12 16:19:40 -0400 | |
|---|---|---|
| committer | 2015-05-12 16:19:40 -0400 | |
| commit | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (patch) | |
| tree | 20c9894691353ee8bab4eec668e9b0b6c6426e0f /SQLiteStudio3/sqlitestudio | |
| parent | a308f430f694423064ebc86fd0506c8c6fdb3d93 (diff) | |
Imported Upstream version 3.0.6upstream/3.0.6
Diffstat (limited to 'SQLiteStudio3/sqlitestudio')
8 files changed, 103 insertions, 98 deletions
diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp index 4ec98cc..0ac506f 100644 --- a/SQLiteStudio3/sqlitestudio/main.cpp +++ b/SQLiteStudio3/sqlitestudio/main.cpp @@ -34,6 +34,7 @@ #include <QPluginLoader>
#include <QDebug>
#include <QMessageBox>
+#include <QProcess>
bool listPlugins = false;
@@ -92,6 +93,7 @@ int main(int argc, char *argv[]) {
QApplication a(argc, argv);
+#ifdef PORTABLE_CONFIG
int retCode = 1;
UpdateManager::setRetryFunction(updateRetryFunction);
if (UpdateManager::handleUpdateOptions(a.arguments(), retCode))
@@ -101,6 +103,7 @@ int main(int argc, char *argv[]) return retCode;
}
+#endif
qInstallMessageHandler(uiMessageHandler);
@@ -163,7 +166,9 @@ int main(int argc, char *argv[]) if (!dbToOpen.isNull())
MainWindow::getInstance()->openDb(dbToOpen);
+#ifdef PORTABLE_CONFIG
UPDATES->checkForUpdates();
+#endif
return a.exec();
}
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts index 1d96a62..7072f7c 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts @@ -4,68 +4,68 @@ <context> <name>QObject</name> <message> - <location filename="../main.cpp" line="43"/> + <location filename="../main.cpp" line="44"/> <source>GUI interface to SQLiteStudio, a SQLite manager.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="47"/> + <location filename="../main.cpp" line="48"/> <source>Enables debug messages in console (accessible with F12).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="48"/> + <location filename="../main.cpp" line="49"/> <source>Redirects debug messages into standard output (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>Redirects debug messages into given file (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="50"/> + <location filename="../main.cpp" line="51"/> <source>Enables Lemon parser debug messages for SQL code assistant.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="51"/> + <location filename="../main.cpp" line="52"/> <source>Enables debugging of every single SQL query being sent to any database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>Limits SQL query messages to only the given <database>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="53"/> + <location filename="../main.cpp" line="54"/> <source>Lists plugins installed in the SQLiteStudio and quits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="85"/> - <location filename="../main.cpp" line="100"/> + <location filename="../main.cpp" line="86"/> + <location filename="../main.cpp" line="102"/> <source>Error</source> <translation type="unfinished"></translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts index 34ff1b5..443941d 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts @@ -4,68 +4,68 @@ <context> <name>QObject</name> <message> - <location filename="../main.cpp" line="43"/> + <location filename="../main.cpp" line="44"/> <source>GUI interface to SQLiteStudio, a SQLite manager.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="47"/> + <location filename="../main.cpp" line="48"/> <source>Enables debug messages in console (accessible with F12).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="48"/> + <location filename="../main.cpp" line="49"/> <source>Redirects debug messages into standard output (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>Redirects debug messages into given file (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="50"/> + <location filename="../main.cpp" line="51"/> <source>Enables Lemon parser debug messages for SQL code assistant.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="51"/> + <location filename="../main.cpp" line="52"/> <source>Enables debugging of every single SQL query being sent to any database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>Limits SQL query messages to only the given <database>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="53"/> + <location filename="../main.cpp" line="54"/> <source>Lists plugins installed in the SQLiteStudio and quits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="85"/> - <location filename="../main.cpp" line="100"/> + <location filename="../main.cpp" line="86"/> + <location filename="../main.cpp" line="102"/> <source>Error</source> <translation type="unfinished"></translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts index 3a5ef09..f801dd7 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts @@ -4,69 +4,69 @@ <context> <name>QObject</name> <message> - <location filename="../main.cpp" line="43"/> + <location filename="../main.cpp" line="44"/> <source>GUI interface to SQLiteStudio, a SQLite manager.</source> <translatorcomment>Interface GUI de SQLiteStudio un outil pour SQLite</translatorcomment> <translation></translation> </message> <message> - <location filename="../main.cpp" line="47"/> + <location filename="../main.cpp" line="48"/> <source>Enables debug messages in console (accessible with F12).</source> <translation>Messages de déboguage avec la console(accessible avec F12).</translation> </message> <message> - <location filename="../main.cpp" line="48"/> + <location filename="../main.cpp" line="49"/> <source>Redirects debug messages into standard output (forces debug mode).</source> <translation>Messages de déboguage redirigés vers sortie standard(mode déboguage forcé).</translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>Redirects debug messages into given file (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="50"/> + <location filename="../main.cpp" line="51"/> <source>Enables Lemon parser debug messages for SQL code assistant.</source> <translation>Message de déboguage avec l'analyseur Lemon pour un assistant code SQL.</translation> </message> <message> - <location filename="../main.cpp" line="51"/> + <location filename="../main.cpp" line="52"/> <source>Enables debugging of every single SQL query being sent to any database.</source> <translation>Déboguage pour toutes requêtes SQL simple utilisé pour la plupart des bases de données.</translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>Limits SQL query messages to only the given <database>.</source> <translation>Limites des meesages de la requête SQL pour la <database>.</translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>database</source> <translation>Base de données</translation> </message> <message> - <location filename="../main.cpp" line="53"/> + <location filename="../main.cpp" line="54"/> <source>Lists plugins installed in the SQLiteStudio and quits.</source> <translation>Listes des plugins installés dans SQLiteStudio et quitter.</translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>file</source> <translation>Fichier</translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>Database file to open</source> <translation>Fichier de la base de données à ouvrir</translation> </message> <message> - <location filename="../main.cpp" line="85"/> - <location filename="../main.cpp" line="100"/> + <location filename="../main.cpp" line="86"/> + <location filename="../main.cpp" line="102"/> <source>Error</source> <translation>Erreur</translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts index c95e02a..2a54175 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts @@ -4,68 +4,68 @@ <context> <name>QObject</name> <message> - <location filename="../main.cpp" line="43"/> + <location filename="../main.cpp" line="44"/> <source>GUI interface to SQLiteStudio, a SQLite manager.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="47"/> + <location filename="../main.cpp" line="48"/> <source>Enables debug messages in console (accessible with F12).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="48"/> + <location filename="../main.cpp" line="49"/> <source>Redirects debug messages into standard output (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>Redirects debug messages into given file (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="50"/> + <location filename="../main.cpp" line="51"/> <source>Enables Lemon parser debug messages for SQL code assistant.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="51"/> + <location filename="../main.cpp" line="52"/> <source>Enables debugging of every single SQL query being sent to any database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>Limits SQL query messages to only the given <database>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="53"/> + <location filename="../main.cpp" line="54"/> <source>Lists plugins installed in the SQLiteStudio and quits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="85"/> - <location filename="../main.cpp" line="100"/> + <location filename="../main.cpp" line="86"/> + <location filename="../main.cpp" line="102"/> <source>Error</source> <translation type="unfinished"></translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts index 8a9b8ca..711f4a2 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts @@ -4,68 +4,68 @@ <context> <name>QObject</name> <message> - <location filename="../main.cpp" line="43"/> + <location filename="../main.cpp" line="44"/> <source>GUI interface to SQLiteStudio, a SQLite manager.</source> <translation>Графический интерфейс для SQLiteStudio, менеджера баз данных SQLite.</translation> </message> <message> - <location filename="../main.cpp" line="47"/> + <location filename="../main.cpp" line="48"/> <source>Enables debug messages in console (accessible with F12).</source> <translation>Включает вывод отладочных сообщений в консоль (доступную по нажатию F12).</translation> </message> <message> - <location filename="../main.cpp" line="48"/> + <location filename="../main.cpp" line="49"/> <source>Redirects debug messages into standard output (forces debug mode).</source> <translation>Перенаправляет отладочные сообщения в стандартный поток (принудительный отладочный режим).</translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>Redirects debug messages into given file (forces debug mode).</source> <translation>Перенаправляет отладочные сообщения в указанный файл (принудительный отладочный режим).</translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>log file</source> <translation>файл журнала</translation> </message> <message> - <location filename="../main.cpp" line="50"/> + <location filename="../main.cpp" line="51"/> <source>Enables Lemon parser debug messages for SQL code assistant.</source> <translation>Включает вывод отладочных сообщений анализатора Lemon для автодополнения SQL кода.</translation> </message> <message> - <location filename="../main.cpp" line="51"/> + <location filename="../main.cpp" line="52"/> <source>Enables debugging of every single SQL query being sent to any database.</source> <translation>Включает отладку каждого запроса SQL, посылаемого к любой базе данных.</translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>Limits SQL query messages to only the given <database>.</source> <translation>Ограничивает сообщения запросов SQL только для указанной <базы данных>.</translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>database</source> <translation>база данных</translation> </message> <message> - <location filename="../main.cpp" line="53"/> + <location filename="../main.cpp" line="54"/> <source>Lists plugins installed in the SQLiteStudio and quits.</source> <translation>Выводит список установленных в SQLiteStudio модулей и осуществляет выход.</translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>file</source> <translation>файл</translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>Database file to open</source> <translation>Файл базы данных для открытия</translation> </message> <message> - <location filename="../main.cpp" line="85"/> - <location filename="../main.cpp" line="100"/> + <location filename="../main.cpp" line="86"/> + <location filename="../main.cpp" line="102"/> <source>Error</source> <translation>Ошибка</translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts index 4c82ea1..a7b3257 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts @@ -4,68 +4,68 @@ <context> <name>QObject</name> <message> - <location filename="../main.cpp" line="43"/> + <location filename="../main.cpp" line="44"/> <source>GUI interface to SQLiteStudio, a SQLite manager.</source> <translation>GUI rozhranie pre SQLiteStudio, SQLite manažér.</translation> </message> <message> - <location filename="../main.cpp" line="47"/> + <location filename="../main.cpp" line="48"/> <source>Enables debug messages in console (accessible with F12).</source> <translation>Aktivuje ladiace správy v konzole (dostupné pomocou F12).</translation> </message> <message> - <location filename="../main.cpp" line="48"/> + <location filename="../main.cpp" line="49"/> <source>Redirects debug messages into standard output (forces debug mode).</source> <translation>Presmerovať ladiace informácie na štandardný výstup (vynútený ladiaci mód).</translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>Redirects debug messages into given file (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="50"/> + <location filename="../main.cpp" line="51"/> <source>Enables Lemon parser debug messages for SQL code assistant.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="51"/> + <location filename="../main.cpp" line="52"/> <source>Enables debugging of every single SQL query being sent to any database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>Limits SQL query messages to only the given <database>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>database</source> <translation>databáza</translation> </message> <message> - <location filename="../main.cpp" line="53"/> + <location filename="../main.cpp" line="54"/> <source>Lists plugins installed in the SQLiteStudio and quits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>file</source> <translation>Súbor</translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="85"/> - <location filename="../main.cpp" line="100"/> + <location filename="../main.cpp" line="86"/> + <location filename="../main.cpp" line="102"/> <source>Error</source> <translation>Chyba</translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts index ff9ee04..222126a 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts @@ -4,68 +4,68 @@ <context> <name>QObject</name> <message> - <location filename="../main.cpp" line="43"/> + <location filename="../main.cpp" line="44"/> <source>GUI interface to SQLiteStudio, a SQLite manager.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="47"/> + <location filename="../main.cpp" line="48"/> <source>Enables debug messages in console (accessible with F12).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="48"/> + <location filename="../main.cpp" line="49"/> <source>Redirects debug messages into standard output (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>Redirects debug messages into given file (forces debug mode).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="49"/> + <location filename="../main.cpp" line="50"/> <source>log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="50"/> + <location filename="../main.cpp" line="51"/> <source>Enables Lemon parser debug messages for SQL code assistant.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="51"/> + <location filename="../main.cpp" line="52"/> <source>Enables debugging of every single SQL query being sent to any database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>Limits SQL query messages to only the given <database>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="52"/> + <location filename="../main.cpp" line="53"/> <source>database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="53"/> + <location filename="../main.cpp" line="54"/> <source>Lists plugins installed in the SQLiteStudio and quits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="62"/> + <location filename="../main.cpp" line="63"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="85"/> - <location filename="../main.cpp" line="100"/> + <location filename="../main.cpp" line="86"/> + <location filename="../main.cpp" line="102"/> <source>Error</source> <translation type="unfinished"></translation> </message> |
