From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 9 Feb 2017 04:36:04 -0500 Subject: Imported Upstream version 3.1.1+dfsg1 --- SQLiteStudio3/sqlitestudio/main.cpp | 5 +++++ SQLiteStudio3/sqlitestudio/sqlitestudio.pro | 6 +++-- SQLiteStudio3/sqlitestudio/sqlitestudio.qrc | 4 ++++ .../sqlitestudio/translations/sqlitestudio_de.ts | 20 ++++++++++++----- .../sqlitestudio/translations/sqlitestudio_es.ts | 20 ++++++++++++----- .../sqlitestudio/translations/sqlitestudio_fr.qm | Bin 1824 -> 1824 bytes .../sqlitestudio/translations/sqlitestudio_fr.ts | 25 ++++++++++++++++----- .../sqlitestudio/translations/sqlitestudio_it.ts | 20 ++++++++++++----- .../sqlitestudio/translations/sqlitestudio_pl.qm | Bin 2259 -> 2450 bytes .../sqlitestudio/translations/sqlitestudio_pl.ts | 10 ++++++++- .../translations/sqlitestudio_pt_BR.ts | 20 ++++++++++++----- .../sqlitestudio/translations/sqlitestudio_ru.qm | Bin 2380 -> 3002 bytes .../sqlitestudio/translations/sqlitestudio_ru.ts | 22 +++++++++++++----- .../sqlitestudio/translations/sqlitestudio_sk.ts | 20 ++++++++++++----- .../translations/sqlitestudio_zh_CN.ts | 20 ++++++++++++----- 15 files changed, 148 insertions(+), 44 deletions(-) (limited to 'SQLiteStudio3/sqlitestudio') 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 ."), 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 @@ + translations/sqlitestudio_de.qm translations/sqlitestudio_pl.qm translations/sqlitestudio_ru.qm translations/sqlitestudio_fr.qm @@ -7,3 +8,6 @@ translations/sqlitestudio_zh_CN.qm + + + 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 @@ - + QObject @@ -61,18 +61,28 @@ Listet die in SQLiteStudio installierten Plugins auf und beendet. - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file Datei - + Database file to open Zu öffnende Datenbankdatei - - + + Error Fehler 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 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file - + Database file to open - - + + Error diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm index 0165b48..9d59c25 100644 Binary files a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm and b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.qm differ 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 @@ Enables Lemon parser debug messages for SQL code assistant. - Message de déboguage avec l’analyseur Lemon pour un assistant code SQL. + Message de déboguage avec l’analyseur Lemon pour un assistant code SQL. @@ -51,22 +51,37 @@ + Enables debugging of SQLiteStudio's query executor. + + + + Lists plugins installed in the SQLiteStudio and quits. Listes des plugins installés dans SQLiteStudio et quitter. - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file Fichier - + Database file to open Fichier de la base de données à ouvrir - - + + Error Erreur 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 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file - + Database file to open - - + + Error diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm index 2da6fe3..df5348b 100644 Binary files a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm and b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm differ 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 @@ - + QObject @@ -59,5 +59,13 @@ Enables debugging of SQLiteStudio's query executor. Włącza debugowanie wykonawcy zapytań w SQLiteStudio. + + Points to the master configuration file. Read manual at wiki page for more details. + + + + SQLiteStudio settings file + + 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 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file - + Database file to open - - + + Error diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm index e6a4c31..b5a73d2 100644 Binary files a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm and b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.qm differ 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 @@ - + QObject @@ -51,7 +51,7 @@ Enables debugging of SQLiteStudio's query executor. - + Включает отладку обработчика запросов SQLiteStudio. @@ -59,18 +59,28 @@ Выводит список установленных в SQLiteStudio модулей и осуществляет выход. - + + Points to the master configuration file. Read manual at wiki page for more details. + Указывает основной файл конфигурации. Детальная информация содержится в инструкции на wiki-странице. + + + + SQLiteStudio settings file + Файл настроек SQLiteStudio + + + file файл - + Database file to open Файл базы данных для открытия - - + + Error Ошибка 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 @@ - + QObject @@ -59,18 +59,28 @@ - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file Súbor - + Database file to open - - + + Error Chyba 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 @@ - + QObject @@ -59,18 +59,28 @@ 列出已安装的插件并退出。 - + + Points to the master configuration file. Read manual at wiki page for more details. + + + + + SQLiteStudio settings file + + + + file 文件 - + Database file to open 要打开的数据库文件 - - + + Error 错误 -- cgit v1.2.3