diff options
Diffstat (limited to 'Plugins/DbAndroid')
21 files changed, 615 insertions, 208 deletions
diff --git a/Plugins/DbAndroid/DbAndroid.pro b/Plugins/DbAndroid/DbAndroid.pro index 8c5359c..49f12e5 100644 --- a/Plugins/DbAndroid/DbAndroid.pro +++ b/Plugins/DbAndroid/DbAndroid.pro @@ -52,7 +52,8 @@ FORMS += \ RESOURCES += \ dbandroid.qrc -TRANSLATIONS += DbAndroid_de.ts \ +TRANSLATIONS += DbAndroid_ro_RO.ts \ + DbAndroid_de.ts \ \ DbAndroid_it.ts\ DbAndroid_zh_CN.ts\ @@ -65,3 +66,4 @@ TRANSLATIONS += DbAndroid_de.ts \ + diff --git a/Plugins/DbAndroid/DbAndroid_de.ts b/Plugins/DbAndroid/DbAndroid_de.ts index 8ec593f..860252b 100644 --- a/Plugins/DbAndroid/DbAndroid_de.ts +++ b/Plugins/DbAndroid/DbAndroid_de.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/DbAndroid_es.ts b/Plugins/DbAndroid/DbAndroid_es.ts index 1ec017b..a8f76aa 100644 --- a/Plugins/DbAndroid/DbAndroid_es.ts +++ b/Plugins/DbAndroid/DbAndroid_es.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/DbAndroid_fr.ts b/Plugins/DbAndroid/DbAndroid_fr.ts index 80bc68a..fa56f0a 100644 --- a/Plugins/DbAndroid/DbAndroid_fr.ts +++ b/Plugins/DbAndroid/DbAndroid_fr.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/DbAndroid_it.ts b/Plugins/DbAndroid/DbAndroid_it.ts index 2096f33..3ce9c38 100644 --- a/Plugins/DbAndroid/DbAndroid_it.ts +++ b/Plugins/DbAndroid/DbAndroid_it.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/DbAndroid_pl.qm b/Plugins/DbAndroid/DbAndroid_pl.qm Binary files differindex 96c4b9a..2b74cd4 100644 --- a/Plugins/DbAndroid/DbAndroid_pl.qm +++ b/Plugins/DbAndroid/DbAndroid_pl.qm diff --git a/Plugins/DbAndroid/DbAndroid_pl.ts b/Plugins/DbAndroid/DbAndroid_pl.ts index 63b1d42..ab196a2 100644 --- a/Plugins/DbAndroid/DbAndroid_pl.ts +++ b/Plugins/DbAndroid/DbAndroid_pl.ts @@ -74,7 +74,12 @@ Chcesz wybrać inny, czy zostawić go nieskonfigurowanego?</translation> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation>Sterownik SQLite Android nie obsługuje ładowalnych rozszerzeń.</translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation>Połączenie z bazą Androida '%1' utracone.</translation> </message> @@ -104,7 +109,7 @@ Chcesz wybrać inny, czy zostawić go nieskonfigurowanego?</translation> <message> <location filename="dbandroidjsonconnection.cpp" line="301"/> <source>Unable to execute query on Android device (connection was closed): %1</source> - <translation type="unfinished"></translation> + <translation>Nie udało się wykonać zapytania na urządzeniu Android (połączenie zostało zamknięte): %1</translation> </message> <message> <location filename="dbandroidjsonconnection.cpp" line="313"/> @@ -206,86 +211,86 @@ Chcesz wybrać inny, czy zostawić go nieskonfigurowanego?</translation> <translation>Usuń aktualnie wybraną bazę danych z urządzenia. Aktualnie wybrana baza to ta wybrana z listy po lewej stronie od tego przycisku.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation>Wprowadź poprawny adres IP.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation>Wybierz urządzenie Android.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation>Wybierz bazę danych Android.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation>Wybierana aplikacja Android jest nieznana, lub niedebugowalna.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation>Stwórz nową bazę</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation>Proszę podać nazwę dla nowej bazy. Jest to nazwa, którą aplikacja Androida będzie używać przy łączeniu z bazą danych:</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation>Niepoprawna nazwa</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation>Baza danych z taką samą nazwą (%1) już istnieje na urządzeniu. Nazwa musi być unikalna.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation>Nie można stworzyć bazy danych '%1', ponieważ nie udało się połączyć z urządzeniem.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation>Nie można stworzyć bazy danych: '%1'. Szczegóły: %2</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation>Usuń bazę danych</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation>Czy na pewno chcesz usunąć bazę danych '%1' z %2?</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation>Błąd usuwania</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation>Nie można połączyć się z %1 w celu usunięcia bazy danych '%2'.</translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation>Nie można usunąć bazy o nazwie '%1' z urządzenia. diff --git a/Plugins/DbAndroid/DbAndroid_pt_BR.ts b/Plugins/DbAndroid/DbAndroid_pt_BR.ts index 5c248c3..d876345 100644 --- a/Plugins/DbAndroid/DbAndroid_pt_BR.ts +++ b/Plugins/DbAndroid/DbAndroid_pt_BR.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/DbAndroid_ro_RO.qm b/Plugins/DbAndroid/DbAndroid_ro_RO.qm Binary files differnew file mode 100644 index 0000000..2856eb9 --- /dev/null +++ b/Plugins/DbAndroid/DbAndroid_ro_RO.qm diff --git a/Plugins/DbAndroid/DbAndroid_ro_RO.ts b/Plugins/DbAndroid/DbAndroid_ro_RO.ts new file mode 100644 index 0000000..2150935 --- /dev/null +++ b/Plugins/DbAndroid/DbAndroid_ro_RO.ts @@ -0,0 +1,347 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="ro_RO"> +<context> + <name>DbAndroid</name> + <message> + <location filename="dbandroid.cpp" line="39"/> + <source>Invalid or incomplete Android Database URL.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="54"/> + <source>Android database URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="55"/> + <source>Select Android database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="151"/> + <source>Select ADB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="173"/> + <source>Using Android Debug Bridge: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="183"/> + <source>You can grab Android connector JAR file from Tools menu. It's required for 2 of 3 connections supported by the Android plugin. For more details read plugin's documentation on <a href="%1">SQLiteStudio's wiki page.</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="191"/> + <source>Could not find Android Debug Bridge application. <a href="%1">Click here</a> to point out the location of the ADB application, otherwise the %2 plugin will not support USB cable connections, only the network connection..</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="209"/> + <source>Invalid ADB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="209"/> + <source>The selected ADB is incorrect. +Would you like to select another one, or leave it unconfigured?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="211"/> + <source>Select another ADB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="211"/> + <source>Leave unconfigured</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="232"/> + <source>Save jar file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroid.cpp" line="251"/> + <source>Get Android connector JAR file</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DbAndroidInstance</name> + <message> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> + <source>Connection with Android database '%1' lost.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DbAndroidJsonConnection</name> + <message> + <location filename="dbandroidjsonconnection.cpp" line="175"/> + <source>Cannot connect to device %1, because it's not visible to your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="182"/> + <source>Failed to create port forwarding for device %1 for port %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="196"/> + <source>Could not connect to network host: %1:%2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="210"/> + <source>Cannot connect to %1:%2, because password is invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="301"/> + <source>Unable to execute query on Android device (connection was closed): %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="313"/> + <source>Error while parsing response from Android: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="321"/> + <source>Generic error from Android: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="335"/> + <location filename="dbandroidjsonconnection.cpp" line="342"/> + <source>Missing 'columns' in response from Android.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidjsonconnection.cpp" line="363"/> + <source>Response from Android has missing data for column '%1' in row %2.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DbAndroidPathDialog</name> + <message> + <location filename="dbandroidpathdialog.ui" line="20"/> + <source>Android database URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="26"/> + <source>Connection method</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="32"/> + <source>USB cable - port forwarding</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="42"/> + <source>USB cable - sqlite3 command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="49"/> + <source>Network (IP address)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="59"/> + <source>Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="71"/> + <source>IP address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="93"/> + <source>Port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="115"/> + <source>Remote access password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="127"/> + <source><p>This is password configured in the SQLiteStudio service being embeded in the Android application.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="140"/> + <source>Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="155"/> + <source>Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="168"/> + <source>Database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="177"/> + <source>Create a new database directly on the device.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.ui" line="187"/> + <source>Delete currently selected database from the device. The currently selected database is the one picked in the list on the left of this button.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="362"/> + <source>Enter valid IP address.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="367"/> + <source>Pick Android device.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="371"/> + <source>Pick Android database.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="395"/> + <source>Selected Android application is unknown, or not debuggable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="422"/> + <source>Create new database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="422"/> + <source>Please provide name for the new database. +It's the name which Android application will use to connect to the database:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> + <source>Invalid name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <source>Database with the same name (%1) already exists on the device. +The name must be unique.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <source>Could not create database '%1', because could not connect to the device.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="448"/> + <source>Could not create database '%1'. +Details: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="463"/> + <source>Delete database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="463"/> + <source>Are you sure you want to delete database '%1' from %2?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> + <source>Error deleting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <source>Could not connect to %1 in order to delete database '%2'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidpathdialog.cpp" line="490"/> + <source>Could not delete database named '%1' from the device. +Android device refused deletion, or it was impossible.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DbAndroidShellConnection</name> + <message> + <location filename="dbandroidshellconnection.cpp" line="31"/> + <source>Cannot connect to device %1, because it's not visible to your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidshellconnection.cpp" line="46"/> + <source>Cannot connect to device %1, because the application %2 doesn't seem to be installed on the device.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidshellconnection.cpp" line="56"/> + <source>Cannot connect to device %1, because the application %2 is not debuggable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidshellconnection.cpp" line="65"/> + <source>Cannot connect to device %1, because '%2' command doesn't seem to be available on the device.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidshellconnection.cpp" line="77"/> + <source>Cannot connect to device %1, because '%2' database cannot be accessed on the device.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidshellconnection.cpp" line="90"/> + <source>Cannot connect to device %1, because '%2' database cannot be accessed on the device. Details: %3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidshellconnection.cpp" line="126"/> + <source>Cannot get list of databases for application %1. Details: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidshellconnection.cpp" line="207"/> + <location filename="dbandroidshellconnection.cpp" line="214"/> + <source>Could not execute query on database '%1': %2</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="sqlqueryandroid.cpp" line="101"/> + <source>Cannot bind argument '%1' of the query, because it's value is missing.</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/Plugins/DbAndroid/DbAndroid_ru.ts b/Plugins/DbAndroid/DbAndroid_ru.ts index 115a72f..8f086e5 100644 --- a/Plugins/DbAndroid/DbAndroid_ru.ts +++ b/Plugins/DbAndroid/DbAndroid_ru.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/DbAndroid_sk.ts b/Plugins/DbAndroid/DbAndroid_sk.ts index 89b0604..b5f07d0 100644 --- a/Plugins/DbAndroid/DbAndroid_sk.ts +++ b/Plugins/DbAndroid/DbAndroid_sk.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/DbAndroid_zh_CN.ts b/Plugins/DbAndroid/DbAndroid_zh_CN.ts index fbe2aa8..56ecde4 100644 --- a/Plugins/DbAndroid/DbAndroid_zh_CN.ts +++ b/Plugins/DbAndroid/DbAndroid_zh_CN.ts @@ -73,7 +73,12 @@ Would you like to select another one, or leave it unconfigured?</source> <context> <name>DbAndroidInstance</name> <message> - <location filename="dbandroidinstance.cpp" line="141"/> + <location filename="dbandroidinstance.cpp" line="74"/> + <source>Android SQLite driver does not support loadable extensions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dbandroidinstance.cpp" line="156"/> <source>Connection with Android database '%1' lost.</source> <translation type="unfinished"></translation> </message> @@ -205,83 +210,83 @@ Would you like to select another one, or leave it unconfigured?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="382"/> + <location filename="dbandroidpathdialog.cpp" line="362"/> <source>Enter valid IP address.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="387"/> + <location filename="dbandroidpathdialog.cpp" line="367"/> <source>Pick Android device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="391"/> + <location filename="dbandroidpathdialog.cpp" line="371"/> <source>Pick Android database.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="415"/> + <location filename="dbandroidpathdialog.cpp" line="395"/> <source>Selected Android application is unknown, or not debuggable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Create new database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="442"/> + <location filename="dbandroidpathdialog.cpp" line="422"/> <source>Please provide name for the new database. It's the name which Android application will use to connect to the database:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> - <location filename="dbandroidpathdialog.cpp" line="459"/> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Invalid name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="450"/> + <location filename="dbandroidpathdialog.cpp" line="430"/> <source>Database with the same name (%1) already exists on the device. The name must be unique.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="459"/> + <location filename="dbandroidpathdialog.cpp" line="439"/> <source>Could not create database '%1', because could not connect to the device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="468"/> + <location filename="dbandroidpathdialog.cpp" line="448"/> <source>Could not create database '%1'. Details: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Delete database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="483"/> + <location filename="dbandroidpathdialog.cpp" line="463"/> <source>Are you sure you want to delete database '%1' from %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Error deleting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="504"/> + <location filename="dbandroidpathdialog.cpp" line="484"/> <source>Could not connect to %1 in order to delete database '%2'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="dbandroidpathdialog.cpp" line="510"/> + <location filename="dbandroidpathdialog.cpp" line="490"/> <source>Could not delete database named '%1' from the device. Android device refused deletion, or it was impossible.</source> <translation type="unfinished"></translation> diff --git a/Plugins/DbAndroid/adbmanager.cpp b/Plugins/DbAndroid/adbmanager.cpp index bbcf8fc..e182c72 100644 --- a/Plugins/DbAndroid/adbmanager.cpp +++ b/Plugins/DbAndroid/adbmanager.cpp @@ -148,7 +148,13 @@ QString AdbManager::findAdb() return "adb.exe"; static_qstring(winAdbPath, "/../Android/sdk/platform-tools/adb.exe"); - for (const QString& path : QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation)) + for (const QString& path : QStandardPaths::standardLocations( +#if QT_VERSION >= 0x050400 + QStandardPaths::AppLocalDataLocation +#else + QStandardPaths::GenericDataLocation +#endif + )) { fullPath = QDir::cleanPath(path + winAdbPath); if (testAdb(fullPath, true)) diff --git a/Plugins/DbAndroid/dbandroid.h b/Plugins/DbAndroid/dbandroid.h index 20e9a67..eb4916f 100644 --- a/Plugins/DbAndroid/dbandroid.h +++ b/Plugins/DbAndroid/dbandroid.h @@ -49,7 +49,7 @@ class DBANDROIDSHARED_EXPORT DbAndroid : public GenericPlugin, public DbPlugin bool adbValid = false; QAction* jarAction = nullptr; - static_char* PLUGIN_MANUAL_URL = "http://wiki.sqlitestudio.pl/index.php/DbAndroid"; + static_char* PLUGIN_MANUAL_URL = "https://github.com/pawelsalawa/sqlitestudio/wiki/DbAndroid"; static_char* SELECT_ADB_URL = "select_adb://"; CFG_LOCAL_PERSISTABLE(DbAndroidConfig, cfg) diff --git a/Plugins/DbAndroid/dbandroid.json b/Plugins/DbAndroid/dbandroid.json index 9e36806..689316f 100644 --- a/Plugins/DbAndroid/dbandroid.json +++ b/Plugins/DbAndroid/dbandroid.json @@ -2,7 +2,7 @@ "type": "DbPlugin", "title": "Android SQLite", "description": "Provides support for remote SQLite databases on Android devices.", - "version": 10200, + "version": 10201, "author": "SalSoft", "minAppVersion": 30100, "gui": true, diff --git a/Plugins/DbAndroid/dbandroidinstance.cpp b/Plugins/DbAndroid/dbandroidinstance.cpp index b60203e..900b929 100644 --- a/Plugins/DbAndroid/dbandroidinstance.cpp +++ b/Plugins/DbAndroid/dbandroidinstance.cpp @@ -9,6 +9,7 @@ #include "dbandroidurl.h" #include "schemaresolver.h" #include "services/notifymanager.h" +#include "db/dbsqlite3.h" #include <QJsonObject> #include <QJsonArray> #include <QJsonDocument> @@ -65,6 +66,20 @@ bool DbAndroidInstance::initAfterCreated() return AbstractDb::initAfterCreated(); } +bool DbAndroidInstance::loadExtension(const QString& filePath, const QString& initFunc) +{ + UNUSED(filePath); + UNUSED(initFunc); + errorCode = 1; + errorText = tr("Android SQLite driver does not support loadable extensions."); + return false; +} + +bool DbAndroidInstance::isComplete(const QString& sql) const +{ + return DbSqlite3::complete(sql); +} + bool DbAndroidInstance::isOpenInternal() { return (connection && connection->isConnected()); diff --git a/Plugins/DbAndroid/dbandroidinstance.h b/Plugins/DbAndroid/dbandroidinstance.h index 453b370..157caae 100644 --- a/Plugins/DbAndroid/dbandroidinstance.h +++ b/Plugins/DbAndroid/dbandroidinstance.h @@ -25,6 +25,8 @@ class DbAndroidInstance : public AbstractDb bool registerScalarFunction(const QString& name, int argCount); bool registerAggregateFunction(const QString& name, int argCount); bool initAfterCreated(); + bool loadExtension(const QString& filePath, const QString& initFunc); + bool isComplete(const QString& sql) const; protected: bool isOpenInternal(); diff --git a/Plugins/DbAndroid/dbandroidpathdialog.cpp b/Plugins/DbAndroid/dbandroidpathdialog.cpp index 10a6fb8..66a021b 100644 --- a/Plugins/DbAndroid/dbandroidpathdialog.cpp +++ b/Plugins/DbAndroid/dbandroidpathdialog.cpp @@ -8,13 +8,13 @@ #include "iconmanager.h" #include "dbandroidconnection.h" #include "dbandroidconnectionfactory.h" +#include "common/lazytrigger.h" +#include "common/userinputfilter.h" #include <QDebug> -#include <QTimer> #include <QPushButton> #include <QInputDialog> #include <QMessageBox> #include <QtConcurrent/QtConcurrent> -#include <common/userinputfilter.h> DbAndroidPathDialog::DbAndroidPathDialog(const DbAndroid* plugin, QWidget *parent) : QDialog(parent), @@ -57,15 +57,9 @@ void DbAndroidPathDialog::init() ui->createDatabaseButton->setIcon(ICONS.PLUS); ui->deleteDatabaseButton->setIcon(ICONS.DELETE); - dbListUpdateTimer = new QTimer(this); - dbListUpdateTimer->setSingleShot(true); - dbListUpdateTimer->setInterval(500); - connect(dbListUpdateTimer, SIGNAL(timeout()), this, SLOT(refreshDbList())); - appListUpdateTimer = new QTimer(this); - appListUpdateTimer->setSingleShot(true); - appListUpdateTimer->setInterval(500); - connect(appListUpdateTimer, SIGNAL(timeout()), this, SLOT(refreshAppList())); + dbListUpdateTrigger = new LazyTrigger(500, this, SLOT(refreshDbList())); + appListUpdateTrigger = new LazyTrigger(500, this, SLOT(refreshAppList())); connect(ui->deviceCombo, SIGNAL(currentTextChanged(QString)), this, SLOT(scheduleAppListUpdate())); connect(ui->databaseCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateState())); @@ -185,15 +179,8 @@ void DbAndroidPathDialog::scheduleDbListUpdate() if (suspendDbListUpdates) return; - bool startCover = true; - if (dbListUpdateTimer->isActive()) - { - dbListUpdateTimer->stop(); - startCover = false; - } - - dbListUpdateTimer->start(); - if (startCover) + dbListUpdateTrigger->schedule(); + if (!dbListCover->isVisible()) dbListCover->show(); handleDbCreationUpdate(false); @@ -208,15 +195,8 @@ void DbAndroidPathDialog::scheduleAppListUpdate() if (suspendAppListUpdates) return; - bool startCover = true; - if (appListUpdateTimer->isActive()) - { - appListUpdateTimer->stop(); - startCover = false; - } - - appListUpdateTimer->start(); - if (startCover) + appListUpdateTrigger->schedule(); + if (!appListCover->isVisible()) appListCover->show(); updateValidations(); @@ -373,7 +353,7 @@ void DbAndroidPathDialog::updateDeviceList() void DbAndroidPathDialog::updateValidations() { - bool isUpdating = dbListUpdateTimer->isActive(); + bool isUpdating = dbListCover->isVisible(); bool ipOk = true; bool deviceOk = true; if (ui->ipRadio->isChecked()) diff --git a/Plugins/DbAndroid/dbandroidpathdialog.h b/Plugins/DbAndroid/dbandroidpathdialog.h index 4c4496f..02fff3f 100644 --- a/Plugins/DbAndroid/dbandroidpathdialog.h +++ b/Plugins/DbAndroid/dbandroidpathdialog.h @@ -9,7 +9,7 @@ namespace Ui { } class DbAndroid; -class QTimer; +class LazyTrigger; class WidgetCover; class DbAndroidInstance; @@ -37,8 +37,8 @@ class DbAndroidPathDialog : public QDialog const DbAndroid* plugin = nullptr; DbAndroidUrl dbUrl; Ui::DbAndroidPathDialog *ui; - QTimer* dbListUpdateTimer = nullptr; - QTimer* appListUpdateTimer = nullptr; + LazyTrigger* dbListUpdateTrigger = nullptr; + LazyTrigger* appListUpdateTrigger = nullptr; WidgetCover* dbListCover = nullptr; WidgetCover* appListCover = nullptr; bool updatingDbList = false; diff --git a/Plugins/DbAndroid/package.xml b/Plugins/DbAndroid/package.xml new file mode 100644 index 0000000..32c4a32 --- /dev/null +++ b/Plugins/DbAndroid/package.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?>
+<Package>
+ <DisplayName>Android plugin</DisplayName>
+ <Description>Plugin for accessing Android SQLite databases directly on the Android device from your computer.</Description>
+ <Version>%VERSION%</Version>
+ <ReleaseDate>%DATE%</ReleaseDate>
+ <Name>pl.com.salsoft.sqlitestudio.plugins.dbandroid</Name>
+ <Dependencies>pl.com.salsoft.sqlitestudio.plugins</Dependencies>
+ <Default>true</Default>
+</Package>
\ No newline at end of file |