Skip to content

Commit

Permalink
Merge branch 'devel' into dbeaver#35128-arabic-localization-issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Matvey16 authored Sep 16, 2024
2 parents e8887ed + ab5e2a1 commit 6c4be96
Show file tree
Hide file tree
Showing 763 changed files with 12,368 additions and 7,352 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ body:
attributes:
label: DBeaver Version
description: What version of DBeaver are you running?
placeholder: ex. Community Edition 22.1.0
placeholder: ex. Community Edition 24.1.0
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.app.base.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<feature
id="org.jkiss.dbeaver.app.base.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ui.app.standalone">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.app.base.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.app.base.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.app.local.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<feature
id="org.jkiss.dbeaver.app.local.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName">

<!-- Quick search. Includes minimized ant bundle. No included in non-local as it uses local FS. -->
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.app.local.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.app.local.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.appstore.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.appstore.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ui.app.standalone">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.appstore.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.appstore.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ce.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ce.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ui.app.standalone">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ce.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ce.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.db.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.db.feature"
label="%featureName"
version="1.0.129.qualifier"
version="1.0.130.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.db.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.db.feature</artifactId>
<version>1.0.129-SNAPSHOT</version>
<version>1.0.130-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
3 changes: 2 additions & 1 deletion features/org.jkiss.dbeaver.db.ui.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.db.ui.feature"
label="%featureName"
version="1.0.129.qualifier"
version="1.0.130.qualifier"
provider-name="%providerName">

<description>
Expand All @@ -29,6 +29,7 @@
<plugin id="org.jkiss.dbeaver.ext.vertica.ui" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.ext.athena.ui" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.ext.clickhouse.ui" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.ext.cubrid.ui" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.ext.bigquery.ui" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.ext.spanner.ui" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.ext.snowflake.ui" version="0.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.db.ui.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.db.ui.feature</artifactId>
<version>1.0.129-SNAPSHOT</version>
<version>1.0.130-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.debug.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.debug.feature"
label="%featureName"
version="6.1.128.qualifier"
version="6.1.129.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.debug.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.debug.feature</artifactId>
<version>6.1.128-SNAPSHOT</version>
<version>6.1.129-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.ai.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.ai.feature"
label="%featureName"
version="1.0.40.qualifier"
version="1.0.41.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ui.editors.sql.ai">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.ai.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.ai.feature</artifactId>
<version>1.0.40-SNAPSHOT</version>
<version>1.0.41-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.office.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.office.feature"
label="%featureName"
version="1.1.175.qualifier"
version="1.1.176.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.data.office">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.office.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.office.feature</artifactId>
<version>1.1.175-SNAPSHOT</version>
<version>1.1.176-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.git.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.git.feature"
label="%featureName"
version="1.0.126.qualifier"
version="1.0.127.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.git.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.git.feature</artifactId>
<version>1.0.126-SNAPSHOT</version>
<version>1.0.127-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ide.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ide.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ui.app.eclipse">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ide.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ide.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.rcp.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.rcp.feature"
label="%featureName"
version="3.0.17.qualifier"
version="3.0.18.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.rcp.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.rcp.feature</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>3.0.18-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.runtime.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.runtime.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.model">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.runtime.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.runtime.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.standalone.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.standalone.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ui.app.standalone">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.standalone.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.standalone.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ui.extra.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ui.extra.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ui.extra.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ui.extra.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
3 changes: 2 additions & 1 deletion features/org.jkiss.dbeaver.ui.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ui.feature"
label="%featureName"
version="24.2.0.qualifier"
version="24.2.1.qualifier"
provider-name="%providerName">

<description>
Expand Down Expand Up @@ -32,6 +32,7 @@
<import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
</requires>

<plugin id="org.jkiss.dbeaver.model.rcp" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.core" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.net.ssh.ui" version="0.0.0" />
<plugin id="org.jkiss.dbeaver.ui" version="0.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ui.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ui.feature</artifactId>
<version>24.2.0-SNAPSHOT</version>
<version>24.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
5 changes: 3 additions & 2 deletions osgi-app.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ bundlesPaths=\
repositories=\
https://p2.dev.dbeaver.com/eclipse-repo/;\
https://download.eclipse.org/releases/${eclipse-version}/;
testBundles=\
testLibraries=\
org.junit;\
org.mockito.mockito-core;\
junit-jupiter-api;\
org.opentest4j
org.opentest4j;\
org.hamcrest.core
productsPaths=\
dbeaver/product/community/DBeaver.product;
ideaConfigurationFilesPaths=\
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.jkiss.dbeaver.cmp.simple.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: DBeaver Corp
Bundle-Name: DBeaver Schema Compare UI (Simple)
Bundle-SymbolicName: org.jkiss.dbeaver.cmp.simple.ui;singleton:=true
Bundle-Version: 6.0.134.qualifier
Bundle-Release-Date: 20240902
Bundle-Version: 6.0.135.qualifier
Bundle-Release-Date: 20240923
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.jkiss.dbeaver.tools.compare.simple.ui
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
command.org.jkiss.dbeaver.core.compare.simple.description = Comparer des objets base de donn\u00E9es
command.org.jkiss.dbeaver.core.compare.simple.name = Simple Comparer de Structure

command.org.jkiss.dbeaver.core.compare.simple.description = Comparer des objets base de donn\u00E9es
command.org.jkiss.dbeaver.core.compare.simple.name = Simple Comparer de Structure

menu.compare.label = Comparer/Migrer
2 changes: 1 addition & 1 deletion plugins/org.jkiss.dbeaver.cmp.simple.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.cmp.simple.ui</artifactId>
<version>6.0.134-SNAPSHOT</version>
<version>6.0.135-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
4 changes: 2 additions & 2 deletions plugins/org.jkiss.dbeaver.cmp.simple/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: DBeaver Corp
Bundle-Name: DBeaver Schema Compare (Simple)
Bundle-SymbolicName: org.jkiss.dbeaver.cmp.simple;singleton:=true
Bundle-Version: 6.0.134.qualifier
Bundle-Release-Date: 20240902
Bundle-Version: 6.0.135.qualifier
Bundle-Release-Date: 20240923
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.jkiss.dbeaver.tools.compare.simple
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jkiss.dbeaver.cmp.simple/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.cmp.simple</artifactId>
<version>6.0.134-SNAPSHOT</version>
<version>6.0.135-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
4 changes: 2 additions & 2 deletions plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: DBeaver Corp
Bundle-Name: DBeaver Desktop Application Core
Bundle-SymbolicName: org.jkiss.dbeaver.core;singleton:=true
Bundle-Version: 24.2.0.qualifier
Bundle-Release-Date: 20240902
Bundle-Version: 24.2.1.qualifier
Bundle-Release-Date: 20240923
Bundle-Activator: org.jkiss.dbeaver.core.DBeaverActivator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ keyword.org.jkiss.dbeaver.core.keyword.pref.editor.binary.label = binary hex blo
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.data.label = data edit fetch size limit references scroll segment filters order sql resultset refresh results timeout query subselect cursors key columns navigator errors
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.content.label = lob blob clob object binary commit long encoding utf-8 formatter hex base64 dialog memory separate editor cache content
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.erd.label = erd diagram colorize print margin grid visibility partitions views
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.sql.label = sql script commit separate connection query word occurrence save tab folding results occurrences restore
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.entity.label = object entity editor column sql preview refresh disconnect close
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.sql.label = sql script commit separate connection query word occurrence save tab folding results occurrences restore quotes brackets
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.entity.label = reopen open object entity editor column sql preview refresh disconnect close
keyword.org.jkiss.dbeaver.core.keyword.pref.ui.general.label = update http proxy driver
keyword.org.jkiss.dbeaver.core.keyword.pref.ui.notifications.label = notification sound popup
keyword.org.jkiss.dbeaver.core.keyword.connection = database connection connect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ keyword.org.jkiss.dbeaver.core.keyword.pref.editor.binary.label = binary hex bl
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.data.label = data edit fetch size limit references scroll segment filters order sql resultset refresh results timeout query subselect cursors key columns navigator errors
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.content.label = lob blob clob object binary commit long encoding utf-8 formatter hex base64 dialog memory separate editor cache content
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.erd.label = Entity-Relationship-Modell Farben Drucken Abst\u00E4nde grid visibility partitions views
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.sql.label = sql script commit separate connection query word occurrence save tab folding results occurrences restore
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.entity.label = object entity editor column sql preview refresh
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.sql.label = sql script commit separate connection query word occurrence save tab folding results occurrences restore quotes brackets
keyword.org.jkiss.dbeaver.core.keyword.pref.editor.entity.label = reopen open object entity editor column sql preview refresh
keyword.org.jkiss.dbeaver.core.keyword.pref.ui.general.label = Aktualisierungen http Proxy Treiber
keyword.org.jkiss.dbeaver.core.keyword.connection = Datenbank Verbindungen verbinden
keyword.org.jkiss.dbeaver.core.keyword.database.connection.label = Treiber Sicherheit Fehler Timeout Transaktionen Maven Oracle postgresql Ausf\u00FChrung meta Metadaten commit auto-commit Benachrichtigungen Passwort bouncycastle http Verschl\u00FCsselung
Expand Down
Loading

0 comments on commit 6c4be96

Please sign in to comment.