diff options
Diffstat (limited to 'SQLiteStudio3/sqlitestudio')
15 files changed, 148 insertions, 44 deletions
diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp index 94ee80e..829d657 100644 --- a/SQLiteStudio3/sqlitestudio/main.cpp +++ b/SQLiteStudio3/sqlitestudio/main.cpp @@ -53,6 +53,7 @@ QString uiHandleCmdLineArgs() QCommandLineOption sqlDebugDbNameOption("debug-sql-db", QObject::tr("Limits SQL query messages to only the given <database>."), QObject::tr("database"));
QCommandLineOption executorDebugOption("debug-query-executor", QObject::tr("Enables debugging of SQLiteStudio's query executor."));
QCommandLineOption listPluginsOption("list-plugins", QObject::tr("Lists plugins installed in the SQLiteStudio and quits."));
+ QCommandLineOption masterConfigOption("master-config", QObject::tr("Points to the master configuration file. Read manual at wiki page for more details."), QObject::tr("SQLiteStudio settings file"));
parser.addOption(debugOption);
parser.addOption(debugStdOutOption);
parser.addOption(debugFileOption);
@@ -60,6 +61,7 @@ QString uiHandleCmdLineArgs() parser.addOption(sqlDebugOption);
parser.addOption(sqlDebugDbNameOption);
parser.addOption(executorDebugOption);
+ parser.addOption(masterConfigOption);
parser.addOption(listPluginsOption);
parser.addPositionalArgument(QObject::tr("file"), QObject::tr("Database file to open"));
@@ -77,6 +79,9 @@ QString uiHandleCmdLineArgs() if (parser.isSet(listPluginsOption))
listPlugins = true;
+ if (parser.isSet(masterConfigOption))
+ Config::setMasterConfigFile(parser.value(masterConfigOption));
+
QStringList args = parser.positionalArguments();
if (args.size() > 0)
return args[0];
diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro index d8384d8..42aa7dc 100644 --- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro +++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro @@ -33,10 +33,10 @@ LIBS += -lcoreSQLiteStudio -lguiSQLiteStudio SOURCES += main.cpp -TRANSLATIONS += translations/sqlitestudio_it.ts \ +TRANSLATIONS += translations/sqlitestudio_de.ts \ + translations/sqlitestudio_it.ts \ translations/sqlitestudio_zh_CN.ts \ translations/sqlitestudio_sk.ts \ - translations/sqlitestudio_de.ts \ translations/sqlitestudio_ru.ts \ translations/sqlitestudio_pt_BR.ts \ translations/sqlitestudio_fr.ts \ @@ -74,3 +74,5 @@ RESOURCES += \ + + diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc b/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc index 1abc1e0..9942536 100644 --- a/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc +++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/msg"> + <file>translations/sqlitestudio_de.qm</file> <file>translations/sqlitestudio_pl.qm</file> <file>translations/sqlitestudio_ru.qm</file> <file>translations/sqlitestudio_fr.qm</file> @@ -7,3 +8,6 @@ <file>translations/sqlitestudio_zh_CN.qm</file> </qresource> </RCC> + + + diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts index ff1c85b..fb20723 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="de_DE"> +<TS version="2.1" language="de_DE"> <context> <name>QObject</name> <message> @@ -61,18 +61,28 @@ <translation>Listet die in SQLiteStudio installierten Plugins auf und beendet.</translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation>Datei</translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation>Zu öffnende Datenbankdatei</translation> </message> <message> - <location filename="../main.cpp" line="89"/> - <location filename="../main.cpp" line="105"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <source>Error</source> <translation>Fehler</translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts index 0130240..d58025f 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="es_ES"> +<TS version="2.1" language="es_ES"> <context> <name>QObject</name> <message> @@ -59,18 +59,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="89"/> - <location filename="../main.cpp" line="105"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <source>Error</source> <translation type="unfinished"></translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm Binary files differindex 0165b48..9d59c25 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts index 78be06b..fc7e350 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts @@ -32,7 +32,7 @@ <message> <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> + <translation>Message de déboguage avec l’analyseur Lemon pour un assistant code SQL.</translation> </message> <message> <location filename="../main.cpp" line="52"/> @@ -51,22 +51,37 @@ </message> <message> <location filename="../main.cpp" line="54"/> + <source>Enables debugging of SQLiteStudio's query executor.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="55"/> <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="63"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation>Fichier</translation> </message> <message> - <location filename="../main.cpp" line="63"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation>Fichier de la base de données à ouvrir</translation> </message> <message> - <location filename="../main.cpp" line="86"/> - <location filename="../main.cpp" line="102"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <source>Error</source> <translation>Erreur</translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts index 9cd5c61..88ce9ce 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="it_IT"> +<TS version="2.1" language="it_IT"> <context> <name>QObject</name> <message> @@ -59,18 +59,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="89"/> - <location filename="../main.cpp" line="105"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <source>Error</source> <translation type="unfinished"></translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm Binary files differindex 2da6fe3..df5348b 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts index 700bb5e..365a823 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="pl_PL"> +<TS version="2.1" language="pl_PL"> <context> <name>QObject</name> <message> @@ -59,5 +59,13 @@ <source>Enables debugging of SQLiteStudio's query executor.</source> <translation>Włącza debugowanie wykonawcy zapytań w SQLiteStudio.</translation> </message> + <message> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts index b637de7..95025b4 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="pt_BR"> +<TS version="2.1" language="pt_BR"> <context> <name>QObject</name> <message> @@ -59,18 +59,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="89"/> - <location filename="../main.cpp" line="105"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <source>Error</source> <translation type="unfinished"></translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm Binary files differindex e6a4c31..b5a73d2 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts index 9808fe7..65f0cf4 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="ru_RU"> +<TS version="2.1" language="ru_RU"> <context> <name>QObject</name> <message> @@ -51,7 +51,7 @@ <message> <location filename="../main.cpp" line="54"/> <source>Enables debugging of SQLiteStudio's query executor.</source> - <translation type="unfinished"></translation> + <translation>Включает отладку обработчика запросов SQLiteStudio.</translation> </message> <message> <location filename="../main.cpp" line="55"/> @@ -59,18 +59,28 @@ <translation>Выводит список установленных в SQLiteStudio модулей и осуществляет выход.</translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation>Указывает основной файл конфигурации. Детальная информация содержится в инструкции на wiki-странице.</translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation>Файл настроек SQLiteStudio</translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation>файл</translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation>Файл базы данных для открытия</translation> </message> <message> - <location filename="../main.cpp" line="89"/> - <location filename="../main.cpp" line="105"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <source>Error</source> <translation>Ошибка</translation> </message> diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts index 496f44d..6c08225 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="sk_SK"> +<TS version="2.1" language="sk_SK"> <context> <name>QObject</name> <message> @@ -59,18 +59,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation>Súbor</translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.cpp" line="89"/> - <location filename="../main.cpp" line="105"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <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 d5b76d7..0417421 100644 --- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="zh_CN"> +<TS version="2.1" language="zh_CN"> <context> <name>QObject</name> <message> @@ -59,18 +59,28 @@ <translation>列出已安装的插件并退出。</translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="56"/> + <source>Points to the master configuration file. Read manual at wiki page for more details.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="56"/> + <source>SQLiteStudio settings file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../main.cpp" line="67"/> <source>file</source> <translation>文件</translation> </message> <message> - <location filename="../main.cpp" line="65"/> + <location filename="../main.cpp" line="67"/> <source>Database file to open</source> <translation>要打开的数据库文件</translation> </message> <message> - <location filename="../main.cpp" line="89"/> - <location filename="../main.cpp" line="105"/> + <location filename="../main.cpp" line="94"/> + <location filename="../main.cpp" line="110"/> <source>Error</source> <translation>错误</translation> </message> |