git subrepo pull uno

subrepo:
  subdir:   "uno"
  merged:   "66e9aea6"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "66e9aea6"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "4f60dd7"

Author: prrvchr

uno/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = 68a4debdee70a3060b5014982affc0edb700f278
-	parent = 7970acc2f17e7c49641869c6d3be0ace4b2df144
+	commit = 66e9aea6994add573be9c1556b90c87449543a11
+	parent = 6eb3a75f67d0582ac4de866237290bc793e4a4a8
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.9

uno/dialog/embedded/OptionsDialog.xdl

@@ -5,7 +5,7 @@
     <dlg:style dlg:style-id="0" dlg:font-weight="150"/>
   </dlg:styles>
   <dlg:bulletinboard>
-    <dlg:text dlg:id="Label1" dlg:left="10" dlg:top="120" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
-    <dlg:text dlg:id="Label2" dlg:left="140" dlg:top="120" dlg:width="110" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:align="right" dlg:valign="center"/>
+    <dlg:text dlg:id="Label1" dlg:left="10" dlg:top="140" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
+    <dlg:text dlg:id="Label2" dlg:left="140" dlg:top="140" dlg:width="110" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:align="right" dlg:valign="center"/>
   </dlg:bulletinboard>
 </dlg:window>

uno/dialog/jdbc/OptionDialog.xdl

@@ -31,27 +31,33 @@
   </dlg:styles>
   <dlg:bulletinboard>
     <dlg:fixedline dlg:style-id="0" dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="63" dlg:width="244" dlg:height="15" dlg:help-text="&amp;OptionDialog.FixedLine1.HelpText" dlg:value="&amp;OptionDialog.FixedLine1.Label"/>
-    <dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="35" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label1.HelpText" dlg:value="&amp;OptionDialog.Label1.Label" dlg:valign="center"/>
+    <dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="70" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label1.HelpText" dlg:value="&amp;OptionDialog.Label1.Label" dlg:valign="center"/>
     <dlg:radiogroup>
-      <dlg:radio dlg:id="OptionButton1" dlg:tab-index="2" dlg:left="50" dlg:top="80" dlg:width="65" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton1.HelpText" dlg:value="&amp;OptionDialog.OptionButton1.Label" dlg:valign="center">
+      <dlg:radio dlg:id="OptionButton1" dlg:tab-index="2" dlg:left="85" dlg:top="80" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton1.HelpText" dlg:value="&amp;OptionDialog.OptionButton1.Label" dlg:valign="center">
         <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Level0" script:language="UNO"/>
       </dlg:radio>
-      <dlg:radio dlg:id="OptionButton2" dlg:tab-index="3" dlg:left="120" dlg:top="80" dlg:width="65" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton2.HelpText" dlg:value="&amp;OptionDialog.OptionButton2.Label" dlg:valign="center">
+      <dlg:radio dlg:id="OptionButton2" dlg:tab-index="3" dlg:left="145" dlg:top="80" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton2.HelpText" dlg:value="&amp;OptionDialog.OptionButton2.Label" dlg:valign="center">
         <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Level1" script:language="UNO"/>
       </dlg:radio>
-      <dlg:radio dlg:id="OptionButton3" dlg:tab-index="4" dlg:left="190" dlg:top="80" dlg:width="65" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton3.HelpText" dlg:value="&amp;OptionDialog.OptionButton3.Label" dlg:valign="center">
+      <dlg:radio dlg:id="OptionButton3" dlg:tab-index="4" dlg:left="205" dlg:top="80" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton3.HelpText" dlg:value="&amp;OptionDialog.OptionButton3.Label" dlg:valign="center">
         <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Level2" script:language="UNO"/>
       </dlg:radio>
     </dlg:radiogroup>
-    <dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="5" dlg:left="10" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox1.HelpText" dlg:value="&amp;OptionDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false">
+    <dlg:text dlg:id="Label2" dlg:tab-index="5" dlg:left="10" dlg:top="100" dlg:width="70" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label2.HelpText" dlg:value="&amp;OptionDialog.Label2.Label" dlg:valign="center"/>
+    <dlg:radiogroup>
+      <dlg:radio dlg:id="OptionButton4" dlg:tab-index="6" dlg:left="85" dlg:top="100" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton4.HelpText" dlg:value="&amp;OptionDialog.OptionButton4.Label" dlg:valign="center">
+        <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RowSet0" script:language="UNO"/>
+      </dlg:radio>
+      <dlg:radio dlg:id="OptionButton5" dlg:tab-index="7" dlg:left="145" dlg:top="100" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton5.HelpText" dlg:value="&amp;OptionDialog.OptionButton5.Label" dlg:valign="center">
+        <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RowSet1" script:language="UNO"/>
+      </dlg:radio>
+      <dlg:radio dlg:id="OptionButton6" dlg:tab-index="8" dlg:left="205" dlg:top="100" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton6.HelpText" dlg:value="&amp;OptionDialog.OptionButton6.Label" dlg:valign="center">
+        <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RowSet2" script:language="UNO"/>
+      </dlg:radio>
+    </dlg:radiogroup>
+    <dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="9" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox1.HelpText" dlg:value="&amp;OptionDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false">
       <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:SystemTable" script:language="UNO"/>
     </dlg:checkbox>
-    <dlg:checkbox dlg:id="CheckBox2" dlg:tab-index="6" dlg:left="95" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox2.HelpText" dlg:value="&amp;OptionDialog.CheckBox2.Label" dlg:valign="center" dlg:checked="true">
-      <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseBookmark" script:language="UNO"/>
-    </dlg:checkbox>
-    <dlg:checkbox dlg:id="CheckBox3" dlg:tab-index="7" dlg:left="180" dlg:top="100" dlg:width="75" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox3.HelpText" dlg:value="&amp;OptionDialog.CheckBox3.Label" dlg:valign="center" dlg:checked="false">
-      <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:SQLMode" script:language="UNO"/>
-    </dlg:checkbox>
-    <dlg:text dlg:style-id="0" dlg:id="Label2" dlg:tab-index="8" dlg:left="10" dlg:top="185" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label2.HelpText" dlg:value="&amp;OptionDialog.Label2.Label" dlg:align="center" dlg:valign="center"/>
+    <dlg:text dlg:style-id="0" dlg:id="Label3" dlg:tab-index="10" dlg:left="10" dlg:top="185" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label3.HelpText" dlg:value="&amp;OptionDialog.Label3.Label" dlg:align="center" dlg:valign="center"/>
   </dlg:bulletinboard>
 </dlg:window>

uno/dialog/jdbc/OptionDialog_en_US.properties

@@ -2,19 +2,23 @@ OptionDialog.HelpText=
 OptionDialog.Title=
 OptionDialog.FixedLine1.HelpText=
 OptionDialog.FixedLine1.Label=UNO Services
-OptionDialog.Label1.HelpText=
+OptionDialog.Label1.HelpText=SDBC API level delivered by the driver
 OptionDialog.Label1.Label=API level:
-OptionDialog.OptionButton1.HelpText=
+OptionDialog.OptionButton1.HelpText=The delivered SDBC API level will be: com.sun.star.sdbc.*
 OptionDialog.OptionButton1.Label=css.sdbc
-OptionDialog.OptionButton2.HelpText=
+OptionDialog.OptionButton2.HelpText=The delivered SDBC API level will be: com.sun.star.sdbcx.*
 OptionDialog.OptionButton2.Label=css.sdbcx
-OptionDialog.OptionButton3.HelpText=
+OptionDialog.OptionButton3.HelpText=The delivered SDBC API level will be: com.sun.star.sdb.*
 OptionDialog.OptionButton3.Label=css.sdb
-OptionDialog.CheckBox1.HelpText=
+OptionDialog.Label2.HelpText=Use javax.sql.rowset.CachedRowSet to provide ResultSet
+OptionDialog.Label2.Label=Use CachedRowSet:
+OptionDialog.OptionButton4.HelpText=Never use CachedRowSet (not recommended)
+OptionDialog.OptionButton4.Label=Never
+OptionDialog.OptionButton5.HelpText=Use CachedRowSet when there is no primary key or for read and/or forward only ResultSets
+OptionDialog.OptionButton5.Label=If necessary
+OptionDialog.OptionButton6.HelpText=Always use CachedRowSet
+OptionDialog.OptionButton6.Label=Always
+OptionDialog.CheckBox1.HelpText=Show system tables in the Base browser
 OptionDialog.CheckBox1.Label=View system tables
-OptionDialog.CheckBox2.HelpText=
-OptionDialog.CheckBox2.Label=Use bookmarks
-OptionDialog.CheckBox3.HelpText=
-OptionDialog.CheckBox3.Label=Force SQL mode
-OptionDialog.Label2.HelpText=
-OptionDialog.Label2.Label=Changes will take effect after restarting LibreOffice...
+OptionDialog.Label3.HelpText=You have made changes. Restart LibreOffice for the changes to take effect
+OptionDialog.Label3.Label=Changes will take effect after restarting LibreOffice...

uno/dialog/jdbc/OptionDialog_fr_FR.properties

@@ -2,19 +2,23 @@ OptionDialog.HelpText=
 OptionDialog.Title=
 OptionDialog.FixedLine1.HelpText=
 OptionDialog.FixedLine1.Label=Services UNO
-OptionDialog.Label1.HelpText=
+OptionDialog.Label1.HelpText=Niveau de l'API SDBC délivré par le pilote
 OptionDialog.Label1.Label=Niveau API:
-OptionDialog.OptionButton1.HelpText=
+OptionDialog.OptionButton1.HelpText=Le niveau de l'API SDBC délivré sera: com.sun.star.sdbc.*
 OptionDialog.OptionButton1.Label=css.sdbc
-OptionDialog.OptionButton2.HelpText=
+OptionDialog.OptionButton2.HelpText=Le niveau de l'API SDBC délivré sera: com.sun.star.sdbcx.*
 OptionDialog.OptionButton2.Label=css.sdbcx
-OptionDialog.OptionButton3.HelpText=
+OptionDialog.OptionButton3.HelpText=Le niveau de l'API SDBC délivré sera: com.sun.star.sdb.*
 OptionDialog.OptionButton3.Label=css.sdb
-OptionDialog.CheckBox1.HelpText=
-OptionDialog.CheckBox1.Label=Voir les tables syst\u00e8me
-OptionDialog.CheckBox2.HelpText=
-OptionDialog.CheckBox2.Label=Utiliser les signets
-OptionDialog.CheckBox3.HelpText=
-OptionDialog.CheckBox3.Label=Forcer le mode SQL
-OptionDialog.Label2.HelpText=
-OptionDialog.Label2.Label=Les modifications prendront effet apr\u00e8s le red\u00e9marrage de LibreOffice...
+OptionDialog.Label2.HelpText=Utilise javax.sql.rowset.CachedRowSet pour fournir les ResutSets
+OptionDialog.Label2.Label=Utiliser CachedRowSet:
+OptionDialog.OptionButton4.HelpText=Ne jamais utiliser les CachedRowSet (non conseillé)
+OptionDialog.OptionButton4.Label=Jamais
+OptionDialog.OptionButton5.HelpText=Utilisez CachedRowSet en l'absence de clé primaire ou pour les ResultSets de type en lecture et/ou en parcours séquentiel uniquement
+OptionDialog.OptionButton5.Label=Si nécessaire
+OptionDialog.OptionButton6.HelpText=Toujours utiliser les CachedRowSet
+OptionDialog.OptionButton6.Label=Toujours
+OptionDialog.CheckBox1.HelpText=Afficher les tables systèmes dans le navigateur de Base
+OptionDialog.CheckBox1.Label=Voir les tables système
+OptionDialog.Label3.HelpText=Vous avez effectué des modifications. Redémarrez LibreOffice pour que les modifications soient prises en compte
+OptionDialog.Label3.Label=Les modifications prendront effet après le redémarrage de LibreOffice...