Skip to content

Commit

Permalink
Merge branch 'devel' into #29996-dbeaver-freezes-and-has-high-cpu-usa…
Browse files Browse the repository at this point in the history
…ge-with-large-scripts
  • Loading branch information
MashaKorax committed May 13, 2024
2 parents 8f039fa + 1798e60 commit 40e80f3
Show file tree
Hide file tree
Showing 78 changed files with 380 additions and 225 deletions.
1 change: 1 addition & 0 deletions plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.jkiss.dbeaver,
org.jkiss.dbeaver.core,
org.jkiss.dbeaver.core.ui.services,
org.jkiss.dbeaver.registry,
org.jkiss.dbeaver.tools.project,
org.jkiss.dbeaver.tools.scripts,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,6 @@ confirmation.group.general.actions = General actions
confirm.exit.title = Exit DBeaver
confirm.exit.message = Are you sure?
confirm.exit.tip = Warns about application closing
confirm.general.toggleMessage = Do not ask me again

confirm.disconnect_txn.message = You are about to disconnect from database "{0}".\nDo you want to commit the current transaction?
confirm.disconnect_txn.title = Commit changes during disconnection
confirm.disconnect_txn.tip = Warns about uncommitted changes during database disconnection

confirm.reconnect_txn.message = You are about to reconnect to database "{0}".\nDo you want to commit the current transaction?
confirm.reconnect_txn.title = Commit changes during reconnection
confirm.reconnect_txn.tip = Warns about uncommitted changes during database reconnection

confirm.driver_download.message = Driver files ({1}) are missing for database "{0}".\nDo you want to download these files?
confirm.driver_download.title = Download database driver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,6 @@ confirmation.group.general.actions = Allgemeine Aktionen
confirm.exit.title = DBeaver beenden
confirm.exit.message = Sind Sie sicher?
confirm.exit.tip = Warnt wenn die Applikation geschlossen wird
confirm.general.toggleMessage = Nicht mehr nachfragen

confirm.disconnect_txn.message = Die Verbindung zur Datenbank "{0}" soll getrennt werden.\nSoll die aktuelle Transaktion abgeschlossen werden (commit)?
confirm.disconnect_txn.title = \u00C4nderungen abschlie\u00DFen (commit)
confirm.disconnect_txn.tip = Warns about uncommitted changes during database disconnection

confirm.reconnect_txn.message = Sie erstellen eine neue Verbindung zur Datenbank "{0}".\nSoll die aktuelle Transaktion abgeschlossen werden (commit)?
confirm.reconnect_txn.title = \u00C4nderungen abschlie\u00DFen (commit)
confirm.reconnect_txn.tip = Warnt wenn noch nicht \u00FCbertragene \u00C4nderungen bestehen, w\u00E4hrend die Datenbank neu verbunden wird

confirm.driver_download.message = Treiberdateien ({1}) f\u00FCr die Datenbank "{0}" fehlen.\nSollen diese heruntergeladen werden?
confirm.driver_download.title = Datenbanktreiber herunterladen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,9 @@ view.query.manager.title = Gestor de consultas
view.shell.process.title = Procesos

confirmation.group.general.actions = Acciones generales
confirm.disconnect_txn.message = Se va a desconectar de la base de datos "{0}".\n\u00BFQuiere hacer commit de la transacci\u00F3n actual?
confirm.disconnect_txn.title = Commit de los cambios

confirm.driver_download.message = Faltan archivos del driver ({1}) para la base de datos "{0}".\n\u00BFQuiere descargar estos archivos?
confirm.driver_download.title = Descargar driver de la base de datos

confirm.exit.message = \u00BFEst\u00E1 seguro?
confirm.exit.title = Salir de DBeaver
confirm.general.toggleMessage = No volver a preguntar
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ keyword.org.jkiss.dbeaver.core.keyword.pref.editor.content.label = lob blob clob
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.erd.label = erd diagram
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.sql.label = sql script commit separate connection query word occurrence save tab folding
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.entity.label = object entity editor column sql preview refresh
keyword.org.jkiss.dbeaver.core.keyword.pref.ui.general.label=Mettre \u00e0 jour le proxy http
keyword.org.jkiss.dbeaver.core.keyword.pref.ui.general.label=Mettre \u00E0 jour le proxy http

maven.respository.central = D\u00E9p\u00F4t Central
maven.respository.central.unsecure = D\u00E9p\u00F4t Central (non s\u00E9curis\u00E9)
Expand All @@ -128,9 +128,6 @@ perspective.name=DBeaver
menu.org.jkiss.dbeaver.core.project.select.label = Projet actif

confirmation.group.general.actions = Actions g\u00E9n\u00E9rales
confirm.disconnect_txn.message = Vous aller vous d\u00E9connecter de la base "{0}".\nVoulez-vous appliquer les modifications (commit) de la transaction en cours ?
confirm.disconnect_txn.title = Appliquer les modifications (commit)
confirm.general.toggleMessage = Ne plus me demander

confirm.driver_download.message = Les fichiers du pilote ({1}) sont absent pour la base de donn\u00E9es "{0}".\nVoulez-vous t\u00E9l\u00E9charger ces fichiers ?
confirm.driver_download.title = T\u00E9l\u00E9charger le pilote de base de donn\u00E9es
Expand All @@ -139,12 +136,12 @@ confirm.exit.message = Etes-vous s\u00FBr(e) ?

confirm.exit.title = Quitter DBeaver
content-type.org.jkiss.dbeaver.shortcut.name=Raccourci Windows
view.shell.process.description=Suivre et contr\u00f4ler les processus shell en cours d'\u00E9x\u00E9cution
command.org.jkiss.dbeaver.core.new.connection.from.url.name=Nouvelle connexion \u00e0 partir d'une URL JDBC
command.org.jkiss.dbeaver.core.new.connection.from.url.description=Cr\u00E9er une nouvelle connexion \u00e0 partir d'une URL JDBC
view.shell.process.description=Suivre et contr\u00F4ler les processus shell en cours d'\u00E9x\u00E9cution
command.org.jkiss.dbeaver.core.new.connection.from.url.name=Nouvelle connexion \u00E0 partir d'une URL JDBC
command.org.jkiss.dbeaver.core.new.connection.from.url.description=Cr\u00E9er une nouvelle connexion \u00E0 partir d'une URL JDBC
command.org.jkiss.dbeaver.core.new.connection.from.url.name_short=A partir d'une URL JDBC
command.org.jkiss.dbeaver.core.navigator.bookmark.navigate.name=Naviguer Vers
command.org.jkiss.dbeaver.core.navigator.bookmark.navigate.description=Acc\u00E9der \u00e0 un favori
command.org.jkiss.dbeaver.core.navigator.bookmark.navigate.description=Acc\u00E9der \u00E0 un favori
command.org.jkiss.dbeaver.core.disconnectOther.name=D\u00E9connecter les autres
command.org.jkiss.dbeaver.core.disconnectOther.description=Fermer les connexions s\u00E9lectionn\u00E9es
command.org.jkiss.dbeaver.core.disconnectProject.name=Se d\u00E9connecter du projet
Expand All @@ -162,7 +159,7 @@ confirm.disable_network_handler.message=Etes vous sur de d\u00E9sactiver la conf
confirm.disable_network_handler.title=D\u00E9sactiver la configuration r\u00E9seau
org.jkiss.dbeaver.preferences.main.toolbar.customization.name=Personnalisation de la barre d'outils
command.org.jkiss.dbeaver.ui.eula.showPopup.name=Afficher les conditions g\u00E9n\u00E9rales d'utilisation
command.org.jkiss.dbeaver.ui.eula.showPopup.description=Afficher la fen\u00eatre avec les conditions g\u00E9n\u00E9rales d'utilisation
command.org.jkiss.dbeaver.ui.eula.showPopup.description=Afficher la fen\u00EAtre avec les conditions g\u00E9n\u00E9rales d'utilisation
themeElementCategory.org.jkiss.dbeaver.ui.presentation.colors.connectionTypes.label=Types de connexion de base de donn\u00E9es
wizard.org.jkiss.dbeaver.core.wizard.export.workspace.description=Pr\u00E9f\u00E9rences de l'espace de travail DBeaver
wizard.org.jkiss.dbeaver.core.wizard.import.workspace.description=Pr\u00E9f\u00E9rences de l'espace de travail DBeaver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,9 @@ wizard.org.jkiss.dbeaver.core.wizard.new.connection.description = Connessione a
wizard.org.jkiss.dbeaver.core.wizard.new.connection.name = Connessione a Database

confirmation.group.general.actions = Azioni generali
confirm.disconnect_txn.message = Ti stai per disconnettere dal database "{0}".\nVuoi eseguire la commit della transazione corrente?
confirm.disconnect_txn.title = Commit dei cambiamenti

confirm.driver_download.message = Mancano i file del Driver ({1}) per il database "{0}".\nVuoi scaricare questi file?
confirm.driver_download.title = Scarica il driver del database
confirm.general.toggleMessage = Non chiedere di nuovo

confirm.exit.message = Sei sicuro?
confirm.exit.title = Esci da DBeaver
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ menu.org.jkiss.dbeaver.core.project.select.label =\u30A2\u30AF\u30C6\u30A3\u30D6
confirmation.group.general.actions = \u5E38\u898F \u306A\u884C\u52D5
confirm.exit.title =DBeaver\u3092\u7D42\u4E86\u3059\u308B
confirm.exit.message =\u672C\u5F53\u306B\u3088\u308D\u3057\u3044\u3067\u3059\u304B\uFF1F
confirm.general.toggleMessage = \u6B21\u56DE\u304B\u3089\u8868\u793A\u3057\u306A\u3044

confirm.disconnect_txn.message =\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 "{0}"\u304B\u3089\u5207\u65AD\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\n\u73FE\u5728\u306E\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3\u3092\u30B3\u30DF\u30C3\u30C8\u3057\u307E\u3059\u304B\uFF1F
confirm.disconnect_txn.title =\u5909\u66F4\u3092\u30B3\u30DF\u30C3\u30C8\u3059\u308B

confirm.driver_download.message =\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 "{0}"\u306E\u30C9\u30E9\u30A4\u30D0\u30D5\u30A1\u30A4\u30EB\uFF08{1}\uFF09\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u3053\u308C\u3089\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304B\uFF1F
confirm.driver_download.title =\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ maven.respository.central.unsecure = \uC911\uC559 \uC800\uC7A5\uC18C (unsecure)
menu.org.jkiss.dbeaver.core.project.select.label = \uD65C\uC131 \uD504\uB85C\uC81D\uD2B8

confirmation.group.general.actions = \uC77C\uBC18 \uC791\uC5C5
confirm.disconnect_txn.message = "{0}" \uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uC5F0\uACB0\uC744 \uC885\uB8CC\uD569\uB2C8\uB2E4. \uD604\uC7AC \uD2B8\uB79C\uC7AD\uC158\uC744 \uCEE4\uBC0B\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
confirm.disconnect_txn.title = \uBCC0\uACBD\uC0AC\uD56D \uCEE4\uBC0B
confirm.general.toggleMessage = \uC120\uD0DD\uC744 \uC800\uC7A5

confirm.driver_download.message = {0} \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC758 \uB4DC\uB77C\uC774\uBC84 \uD30C\uC77C({1})\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. \n\uC774 \uD30C\uC77C\uC744 \uB2E4\uC6B4\uB85C\uB4DC \uBC1B\uC73C\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?\n
confirm.driver_download.title = \uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uB4DC\uB77C\uC774\uBC84 \uB2E4\uC6B4\uB85C\uB4DC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,12 @@ command.org.jkiss.dbeaver.ui.eula.showPopup.name = Exibir
command.org.jkiss.dbeaver.ui.tools.menu.description = Mostra o menu de contexto com ferramentas de banco de dados
command.org.jkiss.dbeaver.ui.tools.menu.name = Ferramentas de contexto

confirm.disconnect_txn.message = Voc\u00EA ser\u00E1 desconectado do banco de dados "{0}".\nDeseja aplicar a transa\u00E7\u00E3o atual?
confirm.disconnect_txn.tip = Alerta sobre mudan\u00E7as n\u00E3o aplicadas ao desconectar-se de um banco de dados
confirm.disconnect_txn.title = Aplicar mudan\u00E7as ao se desconectar
confirm.driver_download.message = Arquivos do driver ({1}) est\u00E3o faltando para o banco de dados "{0}".\nDeseja baixar esses arquivos?
confirm.driver_download.tip = Alerta sobre arquivos de driver faltantes
confirm.driver_download.title = Baixar driver do banco de dados
confirm.exit.message = Tem certeza?
confirm.exit.tip = Alerta sobre o encerramento da aplica\u00E7\u00E3o
confirm.exit.title = Sair do DBeaver
confirm.general.toggleMessage = N\u00E3o me pergunte novamente
confirm.reconnect_txn.message = Voc\u00EA ser\u00E1 reconectado ao banco de dados "{0}".\nDeseja aplicar a transa\u00E7\u00E3o atual?
confirm.reconnect_txn.tip = Alerta sobre mudan\u00E7as n\u00E3o aplicadas ao reconectar-se a um banco de dados
confirm.reconnect_txn.title = Aplicar mudan\u00E7as ao se reconectar

confirmation.group.general.actions = A\u00E7\u00F5es gerais

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,12 @@ command.org.jkiss.dbeaver.ui.tools.menu.name = Meniul
confirm.disable_network_handler.message = Sunte\u0163i siguri c\u0103 dori\u0163i s\u0103 dezactiva\u0163i configurarea {0} ?
confirm.disable_network_handler.tip = Informeaz\u0103 despre dezactivarea configura\u021Biei de re\u021Bea
confirm.disable_network_handler.title = Dezactiveaz\u0103 configurarea de re\u0163ea
confirm.disconnect_txn.message = Sunte\u0163i pe cale s\u0103 v\u0103 deconecta\u0163i de la baza de date "{0}".\r\nDori\u0163i s\u0103 aplica\u0163i tranzac\u0163ia curent\u0103 ?
confirm.disconnect_txn.tip = Avertizeaz\u0103 despre modific\u0103rile neaplicate \u00EEn timpul deconect\u0103rii de la baza de date
confirm.disconnect_txn.title = Aplic\u0103 modific\u0103rile \u00EEn timpul deconect\u0103rii
confirm.driver_download.message = Fi\u015Fierele de driver ({1}) lipsesc pentru baza de date "{0}".\r\nDori\u0163i s\u0103 le desc\u0103rca\u0163i ?
confirm.driver_download.tip = Avertizeaz\u0103 despre lipsa fi\u015Fierelor de driver
confirm.driver_download.title = Descarc\u0103 driver-ul
confirm.exit.message = Sunte\u0163i siguri ?
confirm.exit.tip = Avertizeaz\u0103 despre \u00EEnchiderea aplica\u0163iei
confirm.exit.title = Ie\u015Fire din DBeaver
confirm.general.toggleMessage = Nu m\u0103 mai \u00EEntreba
confirm.reconnect_txn.message = Sunte\u0163i pe cale s\u0103 te reconectezi la baza de date "{0}".\r\nDori\u0163i s\u0103 aplica\u0163i tranzac\u0163ia curent\u0103 ?
confirm.reconnect_txn.tip = Avertizeaz\u0103 despre modific\u0103rile neaplicate \u00EEn timpul reconect\u0103rii bazei de date
confirm.reconnect_txn.title = Aplic\u0103 modific\u0103rile \u00EEn timpul reconect\u0103rii

confirmation.group.general.actions = Ac\u0163iuni generale

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ resourceHandler.bookmarks.name = \u0417\u0430\u043A\u043B\u0430\u0434\u043A\u043
confirmation.group.general.actions = \u041E\u0431\u0449\u0438\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F
confirm.exit.title=\u0412\u044B\u0439\u0442\u0438 \u0438\u0437 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B
confirm.exit.message=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B?
confirm.general.toggleMessage=\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0441\u043F\u0440\u0430\u0448\u0438\u0432\u0430\u0442\u044C

confirm.disconnect_txn.title=\u0424\u0438\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F
confirm.disconnect_txn.message=\u0412\u044B \u043E\u0442\u043A\u043B\u044E\u0447\u0430\u0435\u0442\u0435\u0441\u044C \u043E\u0442 \u0411\u0414 "{0}".\n\u0417\u0430\u0444\u0438\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0440\u0430\u043D\u0437\u0430\u043A\u0446\u0438\u044E?

confirm.driver_download.title=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0434\u0440\u0430\u0439\u0432\u0435\u0440 \u0411\u0414
confirm.driver_download.message=\u0424\u0430\u0439\u043B\u044B \u0434\u0440\u0430\u0439\u0432\u0435\u0440\u0430 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044E\u0442 \u0434\u043B\u044F \u0411\u0414 "{0}".\n\u0425\u043E\u0442\u0438\u0442\u0435 \u043B\u0438 \u0412\u044B \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u044D\u0442\u043E\u0442 \u0434\u0440\u0430\u0439\u0432\u0435\u0440 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438?
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ wizard.org.jkiss.dbeaver.core.wizard.new.connection.name = \u8CC7\u6599\u5EAB\u9
confirmation.group.general.actions = \u4E00\u822C\u52D5\u4F5C
confirm.exit.title =\u9000\u51FADBeaver
confirm.exit.message =\u60A8\u78BA\u5B9A\u55CE\uFF1F
confirm.general.toggleMessage =\u4E0D\u8981\u518D\u554F\u6211

confirm.disconnect_txn.message =\u60A8\u5C07\u8981\u8207\u8CC7\u6599\u5EAB"{0}"\u65B7\u958B\u9023\u7DDA\u3002\n \u662F\u5426\u8981\u63D0\u4EA4\u7576\u524D\u4EA4\u6613\uFF1F
confirm.disconnect_txn.title =\u63D0\u4EA4\u8B8A\u66F4

confirm.driver_download.message =\u8CC7\u6599\u5EAB"{0}"\u7F3A\u5C11\u9A45\u52D5\u7A0B\u5F0F\u6A94\u6848\uFF08{1}\uFF09\u3002\n \u662F\u5426\u8981\u4E0B\u8F09\u9019\u4E9B\u6A94\u6848\uFF1F
confirm.driver_download.title =\u4E0B\u8F09\u8CC7\u6599\u5EAB\u9A45\u52D5\u7A0B\u5F0F

0 comments on commit 40e80f3

Please sign in to comment.