diff -Nru libpgjava-42.2.4/build.properties libpgjava-42.2.5/build.properties
--- libpgjava-42.2.4/build.properties	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/build.properties	2018-08-27 15:38:30.000000000 +0000
@@ -19,3 +19,4 @@
 loggerLevel=OFF
 loggerFile=target/pgjdbc-tests.log
 protocolVersion=0
+sslpassword=sslpwd
diff -Nru libpgjava-42.2.4/certdir/README libpgjava-42.2.5/certdir/README
--- libpgjava-42.2.4/certdir/README	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/certdir/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-
-To run the SSL tests, the following properties are used:
-
-certdir: directory where the certificates and keys are store
-
-ssl<TYPE><gh|bh><8|9>: a connection string to the appropriate database
-TYPE is the TYPE or METHOD field from pg_hba.conf that is: host, hostnossl,
-hostssl and the special types hostsslcert, that corresponds
-to a hostssl type with clientcert=1 and cert that corresponds
-to a hostssl type with cert authentication. 'gh' means, the server certificate
-matches the hostname (good hostname), 'bh' means it is not (bad
-hostname). It can be simulated with a single database, if two names
-can be used i.e. localhost and 127.0.0.1. ssloff points to a database,
-where ssl is off. The last number is the server major version
-
-For each connection, the following files should be placed into certdir:
-goodclient.crt, badclient.crt, goodclient.pk8, badclient.pk8, goodroot.crt, badroot.crt
-optionally prefixed by the value of ssl<TYPE><gh|bh>prefix property, if
-different files are necessary for different connect strings.
-
-This directory contains example certificates generated by the following
-commands:
-
-openssl req -x509 -newkey rsa:1024 -days 3650 -keyout goodclient.key -out goodclient.crt
-#Common name is test, password is sslpwd
-
-openssl req -x509 -newkey rsa:1024 -days 3650 -keyout badclient.key -out badclient.crt
-#Common name is test, password is sslpwd
-
-openssl req -x509 -newkey rsa:1024 -days 3650 -nodes -keyout badroot.key -out badroot.crt
-#Common name is localhost
-rm badroot.key
-
-openssl pkcs8 -topk8 -in goodclient.key -out goodclient.pk8 -outform DER -v1 PBE-MD5-DES
-openssl pkcs8 -topk8 -in badclient.key -out badclient.pk8 -outform DER -v1 PBE-MD5-DES
-cp goodclient.crt server/root.crt
-cd server
-openssl req -x509 -newkey rsa:1024 -nodes -days 3650 -keyout server.key -out server.crt
-cp server.crt ../goodroot.crt
-#Common name is localhost, no password
-
-The subdirectory server contains what should be copied to the PGDATA directory.
-If you do not overwrite the pg_hba.conf then remember to comment out all lines
-starting with "host all".
-
-For the tests the sslinfo module must be installed into every database.
-The ssl=on must be set in postgresql.conf
-
-The following command creates the databases and installs the sslinfo module.
-
-for db in hostssldb hostnossldb certdb hostsslcertdb; do
-  createdb $db
-  psql $db -c "create extension sslinfo"
-done
-
-The username for connecting to postgres as specified in build.local.properties tests has to be "test".
-
diff -Nru libpgjava-42.2.4/certdir/README.md libpgjava-42.2.5/certdir/README.md
--- libpgjava-42.2.4/certdir/README.md	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/certdir/README.md	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,44 @@
+To run the SSL tests, the following properties are used:
+
+* certdir: directory where the certificates and keys are store
+* enable_ssl_tests: enables SSL tests
+
+In order to configure PostgreSQL for SSL tests, the following changes should be applied:
+
+* Copy server/server.crt, server/server.key, and server/root.crt to $PGDATA directory
+* In $PGDATA directory: chmod 0600 server.crt server.key root.crt
+* Set ssl=on in postgresql.conf
+* Set ssl_cert_file=server.crt in postgresql.conf
+* Set ssl_key_file=server.key in postgresql.conf
+* Set ssl_ca_file=root.crt in postgresql.conf
+* Add databases for SSL tests. Note: sslinfo extension is used in tests to tell if connection is using SSL or not
+
+      for db in hostssldb hostnossldb certdb hostsslcertdb; do
+        createdb $db
+        psql $db -c "create extension sslinfo"
+      done
+* Add test databases to pg_hba.conf. If you do not overwrite the pg_hba.conf then remember to comment out all lines
+  starting with "host all".
+* Uncomment enable_ssl_tests=true in ssltests.properties
+* The username for connecting to postgres as specified in build.local.properties tests has to be "test".
+
+This directory contains example certificates generated by the following
+commands:
+
+openssl req -x509 -newkey rsa:1024 -days 3650 -keyout goodclient.key -out goodclient.crt
+#Common name is test, password is sslpwd
+
+openssl req -x509 -newkey rsa:1024 -days 3650 -keyout badclient.key -out badclient.crt
+#Common name is test, password is sslpwd
+
+openssl req -x509 -newkey rsa:1024 -days 3650 -nodes -keyout badroot.key -out badroot.crt
+#Common name is localhost
+rm badroot.key
+
+openssl pkcs8 -topk8 -in goodclient.key -out goodclient.pk8 -outform DER -v1 PBE-MD5-DES
+openssl pkcs8 -topk8 -in badclient.key -out badclient.pk8 -outform DER -v1 PBE-MD5-DES
+cp goodclient.crt server/root.crt
+cd server
+openssl req -x509 -newkey rsa:1024 -nodes -days 3650 -keyout server.key -out server.crt
+cp server.crt ../goodroot.crt
+#Common name is localhost, no password
diff -Nru libpgjava-42.2.4/CHANGELOG.md libpgjava-42.2.5/CHANGELOG.md
--- libpgjava-42.2.4/CHANGELOG.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/CHANGELOG.md	2018-08-27 15:38:30.000000000 +0000
@@ -10,6 +10,19 @@
 
 ### Fixed
 
+## [42.2.5] (2018-08-27)
+### Changed
+- `ssl=true` implies `sslmode=verify-full`, that is it requires valid server certificate [cdeeaca4](https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e)
+
+### Added
+- Support for `sslmode=allow/prefer/require` [cdeeaca4](https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e)
+
+### Fixed
+- Security: added server hostname verification for non-default SSL factories in `sslmode=verify-full` (CVE-2018-10936) [cdeeaca4](https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e)
+- Updated documentation on SSL configuration [fa032732](https://github.com/pgjdbc/pgjdbc/commit/fa032732acfe51c6e663ee646dd5c1beaa1af857)
+- Updated Japanese translations [PR 1275](https://github.com/pgjdbc/pgjdbc/pull/1275)
+- IndexOutOfBounds on prepared multistatement with insert values [c2885dd0](https://github.com/pgjdbc/pgjdbc/commit/c2885dd0cfc793f81e5dd3ed2300bb32476eb14a)
+
 ## [42.2.4] (2018-07-14)
 ### Changed
 - PreparedStatement.setNull(int parameterIndex, int t, String typeName) no longer ignores the typeName
@@ -21,7 +34,7 @@
 
 ## [42.2.3] (2018-07-12)
 ### Known issues
-- SQL_TSI_YEAR is treated as hour, SQL_TSI_WEEK is treated as hour, SQL_TSI_MINUTE is treated as minute
+- SQL_TSI_YEAR is treated as hour, SQL_TSI_WEEK is treated as hour, SQL_TSI_MINUTE is treated as second
 
 ### Changed
 - Reduce the severity of the error log messages when an exception is re-thrown. The error will be 
@@ -172,4 +185,5 @@
 [42.2.2]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.1...REL42.2.2
 [42.2.3]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.2...REL42.2.3
 [42.2.4]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.3...REL42.2.4
-[Unreleased]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.4...HEAD
+[42.2.5]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.4...REL42.2.5
+[Unreleased]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.5...HEAD
diff -Nru libpgjava-42.2.4/CONTRIBUTING.md libpgjava-42.2.5/CONTRIBUTING.md
--- libpgjava-42.2.4/CONTRIBUTING.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/CONTRIBUTING.md	2018-08-27 15:38:30.000000000 +0000
@@ -5,11 +5,11 @@
 The purpose of the *Guidelines for Contributing* is to create a collaboration baseline.
 **Do NOT** blindly obey these guidelines, use them (after understanding) where they make sense.
 
-You must know that the PgJDBC driver support Java versions **6**, **7** and **8** mostly the
-Oracle and OpenJDK implementations; and PostgreSQL server versions from **8.2** and higher.
+Currently the PgJDBC driver supports the Oracle and OpenJDK Java implementations of 
+versions **6**, **7**, **8** and **9**; and PostgreSQL server versions from **8.2** and higher.
 
-Some PostgreSQL forks *might* work but are not officially supported, we cheer the vendors of forks
-that want to improve this driver sending us pull requests that are not disruptive to the 
+Some PostgreSQL forks *might* work but are not officially supported, we support vendors of forks
+that want to improve this driver by sending us pull requests that are not disruptive to the 
 community ecosystem of PostgreSQL.
 
 ## Issues
@@ -18,7 +18,7 @@
 
 ### How to submit a bug report
 
-If you found a bug in the PgJDBC driver please use an issue to report it, try to be concise
+If you find a bug in the PgJDBC driver please use an issue to report it, try to be concise
 and detailed in your report, please ensure to specify at least the following:
 
   * Use a concise subject.
@@ -31,17 +31,18 @@
     * A pull request with failing JUnit test case is most preferred, although it's OK to paste
       the test case into the issue description.
 
-You can consider a bug: some behavior that worked before and now it does not; a violation of the
+You can consider a bug: some behaviour that worked before and now it does not; a violation of the
 JDBC spec in any form, unless it's stated otherwise as an extension.
 
-It's hard, but possible, to introduce some breaking changes to the driver every major version update,
-so, please read carefully the changelog and test thoroughly for any potential problem with your app.
+In the unlikely event that a breaking change is introduced in the driver we will update the major version.
+We will document this change but please read carefully the changelog and test thoroughly for any potential problems with your app.
 What is not acceptable is to introduce breaking changes in the minor or patch update of the driver,
-if you found a regression in a minor o patch update, please fill an issue.
+If you find a regression in a minor patch update, please report an issue.
 
-Not every bug report needs to be of code, some can be documentation erratum that can be improved as
-well, the website source code along with the documentation is under **docs**, your are welcome to
-report issues and send pull request too.
+Bug reports are not isolated only to code, errors in documentation as well as the website source 
+code located in the **docs** directory also qualify. You are welcome to report issues and send a 
+pull request on these as well. [skip ci] can be added to the commit message to prevent Travis-CI from building a 
+pull request that only changes the documentation.
 
 For enhancements request keep reading the *Ideas, enhancements and new features* seccion.
 
@@ -56,7 +57,7 @@
 have for standards compliance and security, etc. Include a detailed use-case
 description.
 
-Few of the PgJDBC developers have much spare time, so it's unlikely that your
+Few of the PgJDBC developers have spare time, so it's unlikely that your
 idea will be picked up and implemented for you. The best way to make sure a
 desired feature or improvement happens is to implement it yourself. The PgJDBC
 sources are reasonably clear and they're pure Java, so it's sometimes easier
@@ -121,9 +122,10 @@
   
 After running the build , and build a .jar file (Java ARchive)
 depending on the version of java and which release you have the jar will be named
-postgresql-<major>.<minor>.<release>.jre<N>.jar. Where major,minor are the PostgreSQL major,minor
-version numbers. release is the jdbc release number. N is the version of the JDBC API which 
-corresponds to the version of Java used to compile the driver.
+postgresql-<major>.<minor>.<patch>.[jre<N>].jar. We use Semantic versioning; as such
+major, minor, patch refer to the level of change introduced. For Java 6, and Java 7
+jre<N> will be appended after the patch level. N corresponds to the version of Java, 
+roughly correlated to the JDBC version number.
 
 The target directory will contain the driver jar.
 If you need source code, documentation and runtime dependencies use `mvn package -P release-artifacts`.
@@ -168,11 +170,20 @@
   </toolchain>
 </toolchains>
 ```
+## Checkstyle
+
+We enforce a style using checkstyle, Travis CI will fail if there are checkstyle errors.
+It is recommended you run 
+
+    mvn checkstyle:check 
+
+before creating your pull request
+    
 
 ## Updating translations
 
 From time to time, the translation packages will need to be updated as part of the build process.
-However, this is atypical, and is generally only done when needed such as by a project committer before a major release.
+However, this is atypical, and is generally only done when needed; such as by a project committer before a major release.
 This process adds additional compile time and generally should not be executed for every build.
 
 Updating translations can be accomplished with the following command:
diff -Nru libpgjava-42.2.4/contributors.json libpgjava-42.2.5/contributors.json
--- libpgjava-42.2.4/contributors.json	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/contributors.json	2018-08-27 15:38:30.000000000 +0000
@@ -8,6 +8,7 @@
    "Chen Huajun" : "https://github.com/ChenHuajun",
    "Christian Kotzbauer" : "https://github.com/code-chris",
    "Christian Ullrich" : "https://github.com/chrullrich",
+   "Christoph Berg" : "https://github.com/ChristophBerg",
    "Christopher Deckers" : "https://github.com/Chrriis",
    "Daniel Gustafsson" : "https://github.com/danielgustafsson",
    "Daniel Migowski" : "https://github.com/dmigowski",
@@ -28,7 +29,9 @@
    "Joe Kutner" : "https://github.com/jkutner",
    "Jordan Lewis" : "https://github.com/jordanlewis",
    "Jorge Solorzano" : "https://github.com/jorsol",
+   "Kazuhiro Sera" : "https://github.com/seratch",
    "KimBisgaardDmi" : "https://github.com/KimBisgaardDmi",
+   "Kyotaro Horiguchi" : "https://github.com/horiguti",
    "Laurenz Albe" : "https://github.com/laurenz",
    "Magnus" : "https://github.com/magJ",
    "Magnus Hagander" : "https://github.com/mhagander",
diff -Nru libpgjava-42.2.4/debian/changelog libpgjava-42.2.5/debian/changelog
--- libpgjava-42.2.4/debian/changelog	2018-07-18 11:11:13.000000000 +0000
+++ libpgjava-42.2.5/debian/changelog	2018-08-27 19:20:17.000000000 +0000
@@ -1,3 +1,17 @@
+libpgjava (42.2.5-1) unstable; urgency=medium
+
+  * New upstream security release: added server hostname verification for
+    non-default SSL factories in `sslmode=verify-full` (CVE-2018-10936)
+    https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e
+
+ -- Christoph Berg <myon@debian.org>  Mon, 27 Aug 2018 21:20:17 +0200
+
+libpgjava (42.2.4-2) unstable; urgency=medium
+
+  * Ignore javadoc warnings, they are for unused files anyway. (Closes: #906377)
+
+ -- Christoph Berg <christoph.berg@credativ.de>  Mon, 27 Aug 2018 16:55:02 +0200
+
 libpgjava (42.2.4-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru libpgjava-42.2.4/debian/patches/03-javadoc.patch libpgjava-42.2.5/debian/patches/03-javadoc.patch
--- libpgjava-42.2.4/debian/patches/03-javadoc.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/debian/patches/03-javadoc.patch	2018-08-27 19:09:38.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/pgjdbc/pom.xml
++++ b/pgjdbc/pom.xml
+@@ -438,7 +438,7 @@
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-javadoc-plugin</artifactId>
+           <configuration>
+-            <failOnWarnings>true</failOnWarnings>
++            <failOnWarnings>false</failOnWarnings>
+           </configuration>
+         </plugin>
+       </plugins>
diff -Nru libpgjava-42.2.4/debian/patches/series libpgjava-42.2.5/debian/patches/series
--- libpgjava-42.2.4/debian/patches/series	2018-07-18 11:05:42.000000000 +0000
+++ libpgjava-42.2.5/debian/patches/series	2018-08-27 19:09:38.000000000 +0000
@@ -1,2 +1,3 @@
 01-missing-pom-configuration.patch
 02-scram-optional.patch
+03-javadoc.patch
diff -Nru libpgjava-42.2.4/docs/community/mailinglist.html libpgjava-42.2.5/docs/community/mailinglist.html
--- libpgjava-42.2.4/docs/community/mailinglist.html	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/community/mailinglist.html	2018-08-27 15:38:30.000000000 +0000
@@ -74,7 +74,7 @@
 						<p>
 							This mailing list is for people interested in carefully monitoring
 							the development process.  The mailing list was active until the code
-							base was transfered to GitHub in late 2012. Every commit to this earlier
+							base was transferred to GitHub in late 2012. Every commit to this earlier
 							CVS repository sent out an email with the log message and links to diffs.
 							So the archive of this list, <a href="http://lists.pgfoundry.org/mailman/listinfo/jdbc-commits" target="_blank">pgfoundry site</a>,
 							holds the history of activity with the driver prior to 2013.
diff -Nru libpgjava-42.2.4/docs/development/website.html libpgjava-42.2.5/docs/development/website.html
--- libpgjava-42.2.4/docs/development/website.html	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/development/website.html	2018-08-27 15:38:30.000000000 +0000
@@ -27,7 +27,7 @@
 							The website is produced with <a href="http://jekyllrb.com" target="_blank">Jekyll</a>.
 							It allows you to build a reasonably good looking website that is
 							easy to maintain and modular in nature. Templates are used from the _layout
-							and _includes directories which are then used in conjuction with content that
+							and _includes directories which are then used in conjunction with content that
 							is created with <a href="http://daringfireball.net/projects/markdown/" target="_blank">Markdown</a>,
 							<a href="http://textile.sitemonks.com/" target="_blank">Textile</a>, or
 							just standard HTML for input. Using Markdown or Textile allows the content
@@ -63,4 +63,4 @@
 							have their repositories available for review.
 						</p>
 					</div>
-				</div> <!-- pgContentWrap -->
\ No newline at end of file
+				</div> <!-- pgContentWrap -->
diff -Nru libpgjava-42.2.4/docs/documentation/92/escaped-functions.md libpgjava-42.2.5/docs/documentation/92/escaped-functions.md
--- libpgjava-42.2.4/docs/documentation/92/escaped-functions.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/92/escaped-functions.md	2018-08-27 15:38:30.000000000 +0000
@@ -15,7 +15,7 @@
 values. The appendix C of the JDBC specification describes the functions.
 
 Some functions in the following tables are translated but not reported as supported
-because they are duplicating or changing ther order of the arguments. While this
+because they are duplicating or changing their order of the arguments. While this
 is harmless for literal values or columns, it will cause problems when using
 prepared statements. For example "`{fn right(?,?)}`" will be translated to "`substring(? from (length(?)+1-?))`".
 As you can see the translated SQL requires more parameters than before the
@@ -477,4 +477,4 @@
       <td>&nbsp;</td>
     </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff -Nru libpgjava-42.2.4/docs/documentation/92/media/css/docs.css~ libpgjava-42.2.5/docs/documentation/92/media/css/docs.css~
--- libpgjava-42.2.4/docs/documentation/92/media/css/docs.css~	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/92/media/css/docs.css~	1970-01-01 00:00:00.000000000 +0000
@@ -1,450 +0,0 @@
-/* PostgreSQL.org Documentation Style */
-
-@import url("global.css");
-@import url("table.css");
-@import url("text.css");
-
-body {
-  font-size: 76%;
-}
-
-div.NAVHEADER table {
-  margin-left: 0;
-}
-
-/* Container Definitions */
-
-#docContainerWrap {
-  text-align: center; /* Win IE5 */
-}
-
-#docContainer {
-  margin: 0 auto;
-  width: 90%;
-  padding-bottom: 2em;
-  display: block;
-  text-align: left; /* Win IE5 */
-}
-
-#docHeader {
-  background-image: url("../img/docs/bg_hdr.png");
-  height: 83px;
-  margin: 0px;
-  padding: 0px;
-  display: block;
-}
-
-#docHeaderLogo {
-  position: relative;
-  width: 206px;
-  height: 83px;
-  border: 0px;
-  padding: 0px;
-  margin: 0 0 0 20px;
-}
-
-#docHeaderLogo img {
-  border: 0px;
-}
-
-#docNavSearchContainer {
-  padding-bottom: 2px;
-}
-
-#docNav, #docVersions {
-  position: relative;
-  text-align: left;
-  margin-left: 10px;
-  margin-top: 5px;
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch {
-  position: relative;
-  text-align: right;
-  padding: 0;
-  margin: 0;
-  color: #666;
-}
-
-#docTextSize {
-  text-align: right;
-  white-space: nowrap;
-  margin-top: 7px;
-  font-size: 0.95em;
-}
-
-#docSearch form {
-  position: relative;
-  top: 5px;
-  right: 0;
-  margin: 0; /* need for IE 5.5 OSX */
-  text-align: right; /* need for IE 5.5 OSX */
-  white-space: nowrap; /* for Opera */
-}
-
-#docSearch form label {
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch form input {
-  font-size: 0.95em;
-}
-  
-#docSearch form #submit {
-  font-size: 0.95em;
-  background: #7A7A7A;
-  color: #fff;
-  border: 1px solid #7A7A7A;
-  padding: 1px 4px;
-}
-  
-#docSearch form #q {
-  width: 170px;
-  font-size: 0.95em;
-  border:  1px solid #7A7A7A;
-  background: #E1E1E1;
-  color: #000000;
-  padding: 2px;
-}
-
-.frmDocSearch {
-  padding: 0;
-  margin: 0;
-  display: inline;
-}
-
-.inpDocSearch {
-  padding: 0;
-  margin: 0;
-  color: #000;
-}
-
-#docContent {
-  position: relative;
-  margin-left: 10px;
-  margin-right: 10px;
-  margin-top: 40px;
-}
-
-#docFooter {
-  position: relative;
-  font-size: 0.9em; 
-  color: #666; 
-  line-height: 1.3em; 
-  margin-left: 10px;
-  margin-right: 10px;
-}
-
-#docComments {
-  margin-top: 10px;
-}
-
-#docClear {
-  clear: both;
-  margin: 0;
-  padding: 0;
-}
-
-/* Heading Definitions */
-
-h1, h2, h3 {
-  font-weight: bold;
-  margin-top: 2ex;
-}
-
-h1 {
-  font-size: 1.4em;
-}
-
-h2 {
-  font-size: 1.2em !important;
-}
-
-h3 {
-  font-size: 1.1em;
-}
-
-h1 a:hover {
-  color: #EC5800;
-  text-decoration: none;
-}
-
-h2 a:hover,
-h3 a:hover,
-h4 a:hover {
-  color: #666666;
-  text-decoration: none;
-}
-
-/* Text Styles */
-
-div.SECT2 {
-  margin-top: 4ex;
-}
-
-div.SECT3 {
-  margin-top: 3ex;
-  margin-left: 3ex;
-}
-
-.txtCurrentLocation {
-  font-weight: bold;
-}
-
-p, ol, ul, li {
-  line-height: 1.5em;
-}
-
-.txtCommentsWrap {
-  border: 2px solid #F5F5F5; 
-  width: 100%;
-}
-
-.txtCommentsContent {
-  background: #F5F5F5;
-  padding: 3px;
-}
-
-.txtCommentsPoster {
-  float: left;
-}
-
-.txtCommentsDate {
-  float: right;
-}
-
-.txtCommentsComment {
-  padding: 3px;
-}
-
-#docContainer p code,
-#docContainer dt code,
-#docContainer pre code,
-#docContainer pre tt,
-#docContainer pre pre,
-#docContainer tt tt,
-#docContainer tt code,
-#docContainer tt pre {
-  font-size: 1.5em;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP,
-table.CALSTABLE {
-  -moz-box-shadow: 3px 3px 5px #DFDFDF;
-  -webkit-box-shadow: 3px 3px 5px #DFDFDF;
-  -khtml-box-shadow: 3px 3px 5px #DFDFDF;
-  -o-box-shadow: 3px 3px 5px #DFDFDF;
-  box-shadow: 3px 3px 5px #DFDFDF;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP {
-  color: black;
-  border-width: 1px;
-  border-style: solid;
-  padding: 2ex;
-  margin: 2ex 0 2ex 2ex;
-  overflow: auto;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  border-radius: 8px;
-}
-
-pre.LITERALLAYOUT,
-pre.SYNOPSIS,
-pre.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-.SCREEN {
-  border-color: #CFCFCF;
-  background-color: #F7F7F7;
-}
-
-blockquote.NOTE,
-blockquote.TIP {
-  border-color: #DBDBCC;
-  background-color: #EEEEDD;
-  padding: 14px;
-  width: 572px;
-}
-
-blockquote.NOTE,
-blockquote.TIP,
-table.CAUTION,
-table.WARNING {
-  margin: 4ex auto;
-}
-
-blockquote.NOTE p,
-blockquote.TIP p {
-  margin: 0;
-}
-
-blockquote.NOTE pre,
-blockquote.NOTE code,
-blockquote.TIP pre,
-blockquote.TIP code {
-  margin-left: 0;
-  margin-right: 0;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  -khtml-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-}
-
-.emphasis,
-.c2 {
-  font-weight: bold;
-}
-
-.REPLACEABLE {
-  font-style: italic;
-}
-
-/* Table Styles */
-
-table {
-  margin-left: 2ex;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th,
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-style: solid;
-}
-
-table.CALSTABLE,
-table.CAUTION,
-table.WARNING {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-table.CALSTABLE
-{
-  margin: 2ex 0 2ex 2ex;
-  background-color: #E0ECEF;
-  border: 2px solid #A7C6DF;
-}
-
-table.CALSTABLE tr:hover td
-{
-  background-color: #EFEFEF;
-}
-
-table.CALSTABLE td {
-  background-color: #FFF;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th {
-  border: 1px solid #A7C6DF;
-  padding: 0.5ex 0.5ex;
-}
-
-table.CAUTION,
-table.WARNING {
-  border-collapse: separate;
-  display: block;
-  padding: 0;
-  max-width: 600px;
-}
-
-table.CAUTION {
-  background-color: #F5F5DC;
-  border-color: #DEDFA7;
-}
-
-table.WARNING {
-  background-color: #FFD7D7;
-  border-color: #DF421E;
-}
-
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-width: 0;
-  padding-left: 2ex;
-  padding-right: 2ex;
-}
-
-table.CAUTION td,
-table.CAUTION th {
-  border-color: #F3E4D5
-}
-
-table.WARNING td,
-table.WARNING th {
-  border-color: #FFD7D7;
-}
-
-td.c1,
-td.c2,
-td.c3,
-td.c4,
-td.c5,
-td.c6 {
-  font-size: 1.1em;
-  font-weight: bold;
-  border-bottom: 0px solid #FFEFEF;
-  padding: 1ex 2ex 0;
-}
-
-/* Link Styles */
-
-#docNav a {
-  font-weight: bold;
-}
-
-a:link,
-a:visited,
-a:active,
-a:hover {
-  text-decoration: underline;
-}
-
-a:link,
-a:active {
-  color:#0066A2;
-}
-
-a:visited {
-  color:#004E66;
-}
-
-a:hover {
-  color:#000000;
-}
-
-#docFooter a:link,
-#docFooter a:visited,
-#docFooter a:active {
-  color:#666;
-}
-
-#docContainer code.FUNCTION tt {
-  font-size: 1em;
-}
diff -Nru libpgjava-42.2.4/docs/documentation/92/media/css/table.css~ libpgjava-42.2.5/docs/documentation/92/media/css/table.css~
--- libpgjava-42.2.4/docs/documentation/92/media/css/table.css~	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/92/media/css/table.css~	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/*
-  PostgreSQL.org - Table Styles
-*/
-
-div.tblBasic h2 {
-        margin: 25px 0 .5em 0;
-}
-
-div.tblBasic table {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_lft.png) top left no-repeat;
-	margin-left: 2ex;
-        margin-bottom: 15px;
-}
-
-div.tblBasic table th {
-        padding-top: 20px;
-        border-bottom: 1px solid #EFEFEF;
-        vertical-align: bottom;
-}
-
-div.tblBasic table td {
-        border-bottom: 1px solid #EFEFEF;
-}
-
-div.tblBasic table th,
-div.tblBasic table td {
-        padding: 8px 11px;
-        color: #555555;
-}
-
-div.tblBasic table td.indented {
-        text-indent: 30px;
-}
-
-div.tblBasic table.tblCompact td {
-        padding: 3px 3px;
-}
-
-div.tblBasic table tr.lastrow td {
-        border-bottom: none;
-        padding-bottom: 13px;
-}
-
-div.tblBasic table.tblCompact tr.lastrow td {
-        padding-bottom: 3px;
-}
-
-div.tblBasic table tr.lastrow td.colFirstT,
-div.tblBasic table tr.lastrow td.colFirst {
-        background: url(media/img/layout/nav_tbl_btm_lft.png) bottom left no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey th.colLast,
-div.tblBasic table.tblCompact th.colLast {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_rgt.png) top right no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey tr.lastrow td.colLastT,
-div.tblBasic table.tblBasicGrey tr.lastrow td.colLast,
-div.tblBasic table.tblCompact tr.lastrow td.colLast,
-div.tblBasic table.tblCompact tr.lastrow td.colLastT{
-        background: #F5F5F5 url(media/img/layout/nav_tbl_btm_rgt.png) bottom right no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey tr.firstrow td.colLastT,
-div.tblBasic table.tblBasicGrey tr.firstrow td.colLast,
-div tblBasic table.tblCompact tr.firstrow td.colLast {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_rgt.png) top right no-repeat;
-}
-
-div.tblBasic table th.colMid,
-div.tblBasic table td.colMid,
-div.tblBasic table th.colLast,
-div.tblBasic table td.colLast {
-        background-color: #F5F5F5 ;
-}
-
-div.tblBasic table th.colLastC,
-div.tblBasic table td.colFirstC,
-div.tblBasic table td.colLastC {
-        text-align: center;
-}
-
-div.tblBasic table th.colLastR,
-div.tblBasic table td.colFirstR,
-div.tblBasic table td.colLastR {
-        text-align: right;
-}
-
-div.tblBasic table td.colFirstT,
-div.tblBasic table td.colMidT,
-div.tblBasic table td.colLastT {
-        vertical-align: top;
-}
-
-div.tblBasic table th.colLastRT,
-div.tblBasic table td.colFirstRT,
-div.tblBasic table td.colLastRT {
-        text-align: right;
-        vertical-align: top;
-}
diff -Nru libpgjava-42.2.4/docs/documentation/93/escaped-functions.md libpgjava-42.2.5/docs/documentation/93/escaped-functions.md
--- libpgjava-42.2.4/docs/documentation/93/escaped-functions.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/93/escaped-functions.md	2018-08-27 15:38:30.000000000 +0000
@@ -15,7 +15,7 @@
 values. The appendix C of the JDBC specification describes the functions.
 
 Some functions in the following tables are translated but not reported as supported
-because they are duplicating or changing ther order of the arguments. While this
+because they are duplicating or changing their order of the arguments. While this
 is harmless for literal values or columns, it will cause problems when using
 prepared statements. For example "`{fn right(?,?)}`" will be translated to "`substring(? from (length(?)+1-?))`".
 As you can see the translated SQL requires more parameters than before the
@@ -477,4 +477,4 @@
       <td>&nbsp;</td>
     </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff -Nru libpgjava-42.2.4/docs/documentation/93/media/css/docs.css~ libpgjava-42.2.5/docs/documentation/93/media/css/docs.css~
--- libpgjava-42.2.4/docs/documentation/93/media/css/docs.css~	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/93/media/css/docs.css~	1970-01-01 00:00:00.000000000 +0000
@@ -1,450 +0,0 @@
-/* PostgreSQL.org Documentation Style */
-
-@import url("global.css");
-@import url("table.css");
-@import url("text.css");
-
-body {
-  font-size: 76%;
-}
-
-div.NAVHEADER table {
-  margin-left: 0;
-}
-
-/* Container Definitions */
-
-#docContainerWrap {
-  text-align: center; /* Win IE5 */
-}
-
-#docContainer {
-  margin: 0 auto;
-  width: 90%;
-  padding-bottom: 2em;
-  display: block;
-  text-align: left; /* Win IE5 */
-}
-
-#docHeader {
-  background-image: url("../img/docs/bg_hdr.png");
-  height: 83px;
-  margin: 0px;
-  padding: 0px;
-  display: block;
-}
-
-#docHeaderLogo {
-  position: relative;
-  width: 206px;
-  height: 83px;
-  border: 0px;
-  padding: 0px;
-  margin: 0 0 0 20px;
-}
-
-#docHeaderLogo img {
-  border: 0px;
-}
-
-#docNavSearchContainer {
-  padding-bottom: 2px;
-}
-
-#docNav, #docVersions {
-  position: relative;
-  text-align: left;
-  margin-left: 10px;
-  margin-top: 5px;
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch {
-  position: relative;
-  text-align: right;
-  padding: 0;
-  margin: 0;
-  color: #666;
-}
-
-#docTextSize {
-  text-align: right;
-  white-space: nowrap;
-  margin-top: 7px;
-  font-size: 0.95em;
-}
-
-#docSearch form {
-  position: relative;
-  top: 5px;
-  right: 0;
-  margin: 0; /* need for IE 5.5 OSX */
-  text-align: right; /* need for IE 5.5 OSX */
-  white-space: nowrap; /* for Opera */
-}
-
-#docSearch form label {
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch form input {
-  font-size: 0.95em;
-}
-  
-#docSearch form #submit {
-  font-size: 0.95em;
-  background: #7A7A7A;
-  color: #fff;
-  border: 1px solid #7A7A7A;
-  padding: 1px 4px;
-}
-  
-#docSearch form #q {
-  width: 170px;
-  font-size: 0.95em;
-  border:  1px solid #7A7A7A;
-  background: #E1E1E1;
-  color: #000000;
-  padding: 2px;
-}
-
-.frmDocSearch {
-  padding: 0;
-  margin: 0;
-  display: inline;
-}
-
-.inpDocSearch {
-  padding: 0;
-  margin: 0;
-  color: #000;
-}
-
-#docContent {
-  position: relative;
-  margin-left: 10px;
-  margin-right: 10px;
-  margin-top: 40px;
-}
-
-#docFooter {
-  position: relative;
-  font-size: 0.9em; 
-  color: #666; 
-  line-height: 1.3em; 
-  margin-left: 10px;
-  margin-right: 10px;
-}
-
-#docComments {
-  margin-top: 10px;
-}
-
-#docClear {
-  clear: both;
-  margin: 0;
-  padding: 0;
-}
-
-/* Heading Definitions */
-
-h1, h2, h3 {
-  font-weight: bold;
-  margin-top: 2ex;
-}
-
-h1 {
-  font-size: 1.4em;
-}
-
-h2 {
-  font-size: 1.2em !important;
-}
-
-h3 {
-  font-size: 1.1em;
-}
-
-h1 a:hover {
-  color: #EC5800;
-  text-decoration: none;
-}
-
-h2 a:hover,
-h3 a:hover,
-h4 a:hover {
-  color: #666666;
-  text-decoration: none;
-}
-
-/* Text Styles */
-
-div.SECT2 {
-  margin-top: 4ex;
-}
-
-div.SECT3 {
-  margin-top: 3ex;
-  margin-left: 3ex;
-}
-
-.txtCurrentLocation {
-  font-weight: bold;
-}
-
-p, ol, ul, li {
-  line-height: 1.5em;
-}
-
-.txtCommentsWrap {
-  border: 2px solid #F5F5F5; 
-  width: 100%;
-}
-
-.txtCommentsContent {
-  background: #F5F5F5;
-  padding: 3px;
-}
-
-.txtCommentsPoster {
-  float: left;
-}
-
-.txtCommentsDate {
-  float: right;
-}
-
-.txtCommentsComment {
-  padding: 3px;
-}
-
-#docContainer p code,
-#docContainer dt code,
-#docContainer pre code,
-#docContainer pre tt,
-#docContainer pre pre,
-#docContainer tt tt,
-#docContainer tt code,
-#docContainer tt pre {
-  font-size: 1.5em;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP,
-table.CALSTABLE {
-  -moz-box-shadow: 3px 3px 5px #DFDFDF;
-  -webkit-box-shadow: 3px 3px 5px #DFDFDF;
-  -khtml-box-shadow: 3px 3px 5px #DFDFDF;
-  -o-box-shadow: 3px 3px 5px #DFDFDF;
-  box-shadow: 3px 3px 5px #DFDFDF;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP {
-  color: black;
-  border-width: 1px;
-  border-style: solid;
-  padding: 2ex;
-  margin: 2ex 0 2ex 2ex;
-  overflow: auto;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  border-radius: 8px;
-}
-
-pre.LITERALLAYOUT,
-pre.SYNOPSIS,
-pre.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-.SCREEN {
-  border-color: #CFCFCF;
-  background-color: #F7F7F7;
-}
-
-blockquote.NOTE,
-blockquote.TIP {
-  border-color: #DBDBCC;
-  background-color: #EEEEDD;
-  padding: 14px;
-  width: 572px;
-}
-
-blockquote.NOTE,
-blockquote.TIP,
-table.CAUTION,
-table.WARNING {
-  margin: 4ex auto;
-}
-
-blockquote.NOTE p,
-blockquote.TIP p {
-  margin: 0;
-}
-
-blockquote.NOTE pre,
-blockquote.NOTE code,
-blockquote.TIP pre,
-blockquote.TIP code {
-  margin-left: 0;
-  margin-right: 0;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  -khtml-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-}
-
-.emphasis,
-.c2 {
-  font-weight: bold;
-}
-
-.REPLACEABLE {
-  font-style: italic;
-}
-
-/* Table Styles */
-
-table {
-  margin-left: 2ex;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th,
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-style: solid;
-}
-
-table.CALSTABLE,
-table.CAUTION,
-table.WARNING {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-table.CALSTABLE
-{
-  margin: 2ex 0 2ex 2ex;
-  background-color: #E0ECEF;
-  border: 2px solid #A7C6DF;
-}
-
-table.CALSTABLE tr:hover td
-{
-  background-color: #EFEFEF;
-}
-
-table.CALSTABLE td {
-  background-color: #FFF;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th {
-  border: 1px solid #A7C6DF;
-  padding: 0.5ex 0.5ex;
-}
-
-table.CAUTION,
-table.WARNING {
-  border-collapse: separate;
-  display: block;
-  padding: 0;
-  max-width: 600px;
-}
-
-table.CAUTION {
-  background-color: #F5F5DC;
-  border-color: #DEDFA7;
-}
-
-table.WARNING {
-  background-color: #FFD7D7;
-  border-color: #DF421E;
-}
-
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-width: 0;
-  padding-left: 2ex;
-  padding-right: 2ex;
-}
-
-table.CAUTION td,
-table.CAUTION th {
-  border-color: #F3E4D5
-}
-
-table.WARNING td,
-table.WARNING th {
-  border-color: #FFD7D7;
-}
-
-td.c1,
-td.c2,
-td.c3,
-td.c4,
-td.c5,
-td.c6 {
-  font-size: 1.1em;
-  font-weight: bold;
-  border-bottom: 0px solid #FFEFEF;
-  padding: 1ex 2ex 0;
-}
-
-/* Link Styles */
-
-#docNav a {
-  font-weight: bold;
-}
-
-a:link,
-a:visited,
-a:active,
-a:hover {
-  text-decoration: underline;
-}
-
-a:link,
-a:active {
-  color:#0066A2;
-}
-
-a:visited {
-  color:#004E66;
-}
-
-a:hover {
-  color:#000000;
-}
-
-#docFooter a:link,
-#docFooter a:visited,
-#docFooter a:active {
-  color:#666;
-}
-
-#docContainer code.FUNCTION tt {
-  font-size: 1em;
-}
diff -Nru libpgjava-42.2.4/docs/documentation/93/media/css/table.css~ libpgjava-42.2.5/docs/documentation/93/media/css/table.css~
--- libpgjava-42.2.4/docs/documentation/93/media/css/table.css~	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/93/media/css/table.css~	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/*
-  PostgreSQL.org - Table Styles
-*/
-
-div.tblBasic h2 {
-        margin: 25px 0 .5em 0;
-}
-
-div.tblBasic table {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_lft.png) top left no-repeat;
-	margin-left: 2ex;
-        margin-bottom: 15px;
-}
-
-div.tblBasic table th {
-        padding-top: 20px;
-        border-bottom: 1px solid #EFEFEF;
-        vertical-align: bottom;
-}
-
-div.tblBasic table td {
-        border-bottom: 1px solid #EFEFEF;
-}
-
-div.tblBasic table th,
-div.tblBasic table td {
-        padding: 8px 11px;
-        color: #555555;
-}
-
-div.tblBasic table td.indented {
-        text-indent: 30px;
-}
-
-div.tblBasic table.tblCompact td {
-        padding: 3px 3px;
-}
-
-div.tblBasic table tr.lastrow td {
-        border-bottom: none;
-        padding-bottom: 13px;
-}
-
-div.tblBasic table.tblCompact tr.lastrow td {
-        padding-bottom: 3px;
-}
-
-div.tblBasic table tr.lastrow td.colFirstT,
-div.tblBasic table tr.lastrow td.colFirst {
-        background: url(media/img/layout/nav_tbl_btm_lft.png) bottom left no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey th.colLast,
-div.tblBasic table.tblCompact th.colLast {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_rgt.png) top right no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey tr.lastrow td.colLastT,
-div.tblBasic table.tblBasicGrey tr.lastrow td.colLast,
-div.tblBasic table.tblCompact tr.lastrow td.colLast,
-div.tblBasic table.tblCompact tr.lastrow td.colLastT{
-        background: #F5F5F5 url(media/img/layout/nav_tbl_btm_rgt.png) bottom right no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey tr.firstrow td.colLastT,
-div.tblBasic table.tblBasicGrey tr.firstrow td.colLast,
-div tblBasic table.tblCompact tr.firstrow td.colLast {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_rgt.png) top right no-repeat;
-}
-
-div.tblBasic table th.colMid,
-div.tblBasic table td.colMid,
-div.tblBasic table th.colLast,
-div.tblBasic table td.colLast {
-        background-color: #F5F5F5 ;
-}
-
-div.tblBasic table th.colLastC,
-div.tblBasic table td.colFirstC,
-div.tblBasic table td.colLastC {
-        text-align: center;
-}
-
-div.tblBasic table th.colLastR,
-div.tblBasic table td.colFirstR,
-div.tblBasic table td.colLastR {
-        text-align: right;
-}
-
-div.tblBasic table td.colFirstT,
-div.tblBasic table td.colMidT,
-div.tblBasic table td.colLastT {
-        vertical-align: top;
-}
-
-div.tblBasic table th.colLastRT,
-div.tblBasic table td.colFirstRT,
-div.tblBasic table td.colLastRT {
-        text-align: right;
-        vertical-align: top;
-}
diff -Nru libpgjava-42.2.4/docs/documentation/94/connect.md libpgjava-42.2.5/docs/documentation/94/connect.md
--- libpgjava-42.2.4/docs/documentation/94/connect.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/94/connect.md	2018-08-27 15:38:30.000000000 +0000
@@ -235,7 +235,7 @@
 	Enable optimization to rewrite and collapse compatible INSERT statements that are batched.
 	If enabled, pgjdbc rewrites batch of `insert into ... values(?, ?)` into `insert into ... values(?, ?), (?, ?), ...`
 	That reduces per-statement overhead. The drawback is if one of the statements fail, the whole batch fails.
-	The default value is `false`. The option is avaliable since 9.4.1208
+	The default value is `false`. The option is available since 9.4.1208
 
 * `loginTimeout = int`
 
diff -Nru libpgjava-42.2.4/docs/documentation/94/escaped-functions.md libpgjava-42.2.5/docs/documentation/94/escaped-functions.md
--- libpgjava-42.2.4/docs/documentation/94/escaped-functions.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/94/escaped-functions.md	2018-08-27 15:38:30.000000000 +0000
@@ -15,7 +15,7 @@
 values. The appendix C of the JDBC specification describes the functions.
 
 Some functions in the following tables are translated but not reported as supported
-because they are duplicating or changing ther order of the arguments. While this
+because they are duplicating or changing their order of the arguments. While this
 is harmless for literal values or columns, it will cause problems when using
 prepared statements. For example "`{fn right(?,?)}`" will be translated to "`substring(? from (length(?)+1-?))`".
 As you can see the translated SQL requires more parameters than before the
@@ -477,4 +477,4 @@
       <td>&nbsp;</td>
     </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff -Nru libpgjava-42.2.4/docs/documentation/94/media/css/docs.css~ libpgjava-42.2.5/docs/documentation/94/media/css/docs.css~
--- libpgjava-42.2.4/docs/documentation/94/media/css/docs.css~	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/94/media/css/docs.css~	1970-01-01 00:00:00.000000000 +0000
@@ -1,450 +0,0 @@
-/* PostgreSQL.org Documentation Style */
-
-@import url("global.css");
-@import url("table.css");
-@import url("text.css");
-
-body {
-  font-size: 76%;
-}
-
-div.NAVHEADER table {
-  margin-left: 0;
-}
-
-/* Container Definitions */
-
-#docContainerWrap {
-  text-align: center; /* Win IE5 */
-}
-
-#docContainer {
-  margin: 0 auto;
-  width: 90%;
-  padding-bottom: 2em;
-  display: block;
-  text-align: left; /* Win IE5 */
-}
-
-#docHeader {
-  background-image: url("../img/docs/bg_hdr.png");
-  height: 83px;
-  margin: 0px;
-  padding: 0px;
-  display: block;
-}
-
-#docHeaderLogo {
-  position: relative;
-  width: 206px;
-  height: 83px;
-  border: 0px;
-  padding: 0px;
-  margin: 0 0 0 20px;
-}
-
-#docHeaderLogo img {
-  border: 0px;
-}
-
-#docNavSearchContainer {
-  padding-bottom: 2px;
-}
-
-#docNav, #docVersions {
-  position: relative;
-  text-align: left;
-  margin-left: 10px;
-  margin-top: 5px;
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch {
-  position: relative;
-  text-align: right;
-  padding: 0;
-  margin: 0;
-  color: #666;
-}
-
-#docTextSize {
-  text-align: right;
-  white-space: nowrap;
-  margin-top: 7px;
-  font-size: 0.95em;
-}
-
-#docSearch form {
-  position: relative;
-  top: 5px;
-  right: 0;
-  margin: 0; /* need for IE 5.5 OSX */
-  text-align: right; /* need for IE 5.5 OSX */
-  white-space: nowrap; /* for Opera */
-}
-
-#docSearch form label {
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch form input {
-  font-size: 0.95em;
-}
-  
-#docSearch form #submit {
-  font-size: 0.95em;
-  background: #7A7A7A;
-  color: #fff;
-  border: 1px solid #7A7A7A;
-  padding: 1px 4px;
-}
-  
-#docSearch form #q {
-  width: 170px;
-  font-size: 0.95em;
-  border:  1px solid #7A7A7A;
-  background: #E1E1E1;
-  color: #000000;
-  padding: 2px;
-}
-
-.frmDocSearch {
-  padding: 0;
-  margin: 0;
-  display: inline;
-}
-
-.inpDocSearch {
-  padding: 0;
-  margin: 0;
-  color: #000;
-}
-
-#docContent {
-  position: relative;
-  margin-left: 10px;
-  margin-right: 10px;
-  margin-top: 40px;
-}
-
-#docFooter {
-  position: relative;
-  font-size: 0.9em; 
-  color: #666; 
-  line-height: 1.3em; 
-  margin-left: 10px;
-  margin-right: 10px;
-}
-
-#docComments {
-  margin-top: 10px;
-}
-
-#docClear {
-  clear: both;
-  margin: 0;
-  padding: 0;
-}
-
-/* Heading Definitions */
-
-h1, h2, h3 {
-  font-weight: bold;
-  margin-top: 2ex;
-}
-
-h1 {
-  font-size: 1.4em;
-}
-
-h2 {
-  font-size: 1.2em !important;
-}
-
-h3 {
-  font-size: 1.1em;
-}
-
-h1 a:hover {
-  color: #EC5800;
-  text-decoration: none;
-}
-
-h2 a:hover,
-h3 a:hover,
-h4 a:hover {
-  color: #666666;
-  text-decoration: none;
-}
-
-/* Text Styles */
-
-div.SECT2 {
-  margin-top: 4ex;
-}
-
-div.SECT3 {
-  margin-top: 3ex;
-  margin-left: 3ex;
-}
-
-.txtCurrentLocation {
-  font-weight: bold;
-}
-
-p, ol, ul, li {
-  line-height: 1.5em;
-}
-
-.txtCommentsWrap {
-  border: 2px solid #F5F5F5; 
-  width: 100%;
-}
-
-.txtCommentsContent {
-  background: #F5F5F5;
-  padding: 3px;
-}
-
-.txtCommentsPoster {
-  float: left;
-}
-
-.txtCommentsDate {
-  float: right;
-}
-
-.txtCommentsComment {
-  padding: 3px;
-}
-
-#docContainer p code,
-#docContainer dt code,
-#docContainer pre code,
-#docContainer pre tt,
-#docContainer pre pre,
-#docContainer tt tt,
-#docContainer tt code,
-#docContainer tt pre {
-  font-size: 1.5em;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP,
-table.CALSTABLE {
-  -moz-box-shadow: 3px 3px 5px #DFDFDF;
-  -webkit-box-shadow: 3px 3px 5px #DFDFDF;
-  -khtml-box-shadow: 3px 3px 5px #DFDFDF;
-  -o-box-shadow: 3px 3px 5px #DFDFDF;
-  box-shadow: 3px 3px 5px #DFDFDF;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP {
-  color: black;
-  border-width: 1px;
-  border-style: solid;
-  padding: 2ex;
-  margin: 2ex 0 2ex 2ex;
-  overflow: auto;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  border-radius: 8px;
-}
-
-pre.LITERALLAYOUT,
-pre.SYNOPSIS,
-pre.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-.SCREEN {
-  border-color: #CFCFCF;
-  background-color: #F7F7F7;
-}
-
-blockquote.NOTE,
-blockquote.TIP {
-  border-color: #DBDBCC;
-  background-color: #EEEEDD;
-  padding: 14px;
-  width: 572px;
-}
-
-blockquote.NOTE,
-blockquote.TIP,
-table.CAUTION,
-table.WARNING {
-  margin: 4ex auto;
-}
-
-blockquote.NOTE p,
-blockquote.TIP p {
-  margin: 0;
-}
-
-blockquote.NOTE pre,
-blockquote.NOTE code,
-blockquote.TIP pre,
-blockquote.TIP code {
-  margin-left: 0;
-  margin-right: 0;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  -khtml-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-}
-
-.emphasis,
-.c2 {
-  font-weight: bold;
-}
-
-.REPLACEABLE {
-  font-style: italic;
-}
-
-/* Table Styles */
-
-table {
-  margin-left: 2ex;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th,
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-style: solid;
-}
-
-table.CALSTABLE,
-table.CAUTION,
-table.WARNING {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-table.CALSTABLE
-{
-  margin: 2ex 0 2ex 2ex;
-  background-color: #E0ECEF;
-  border: 2px solid #A7C6DF;
-}
-
-table.CALSTABLE tr:hover td
-{
-  background-color: #EFEFEF;
-}
-
-table.CALSTABLE td {
-  background-color: #FFF;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th {
-  border: 1px solid #A7C6DF;
-  padding: 0.5ex 0.5ex;
-}
-
-table.CAUTION,
-table.WARNING {
-  border-collapse: separate;
-  display: block;
-  padding: 0;
-  max-width: 600px;
-}
-
-table.CAUTION {
-  background-color: #F5F5DC;
-  border-color: #DEDFA7;
-}
-
-table.WARNING {
-  background-color: #FFD7D7;
-  border-color: #DF421E;
-}
-
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-width: 0;
-  padding-left: 2ex;
-  padding-right: 2ex;
-}
-
-table.CAUTION td,
-table.CAUTION th {
-  border-color: #F3E4D5
-}
-
-table.WARNING td,
-table.WARNING th {
-  border-color: #FFD7D7;
-}
-
-td.c1,
-td.c2,
-td.c3,
-td.c4,
-td.c5,
-td.c6 {
-  font-size: 1.1em;
-  font-weight: bold;
-  border-bottom: 0px solid #FFEFEF;
-  padding: 1ex 2ex 0;
-}
-
-/* Link Styles */
-
-#docNav a {
-  font-weight: bold;
-}
-
-a:link,
-a:visited,
-a:active,
-a:hover {
-  text-decoration: underline;
-}
-
-a:link,
-a:active {
-  color:#0066A2;
-}
-
-a:visited {
-  color:#004E66;
-}
-
-a:hover {
-  color:#000000;
-}
-
-#docFooter a:link,
-#docFooter a:visited,
-#docFooter a:active {
-  color:#666;
-}
-
-#docContainer code.FUNCTION tt {
-  font-size: 1em;
-}
diff -Nru libpgjava-42.2.4/docs/documentation/94/media/css/table.css~ libpgjava-42.2.5/docs/documentation/94/media/css/table.css~
--- libpgjava-42.2.4/docs/documentation/94/media/css/table.css~	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/94/media/css/table.css~	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/*
-  PostgreSQL.org - Table Styles
-*/
-
-div.tblBasic h2 {
-        margin: 25px 0 .5em 0;
-}
-
-div.tblBasic table {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_lft.png) top left no-repeat;
-	margin-left: 2ex;
-        margin-bottom: 15px;
-}
-
-div.tblBasic table th {
-        padding-top: 20px;
-        border-bottom: 1px solid #EFEFEF;
-        vertical-align: bottom;
-}
-
-div.tblBasic table td {
-        border-bottom: 1px solid #EFEFEF;
-}
-
-div.tblBasic table th,
-div.tblBasic table td {
-        padding: 8px 11px;
-        color: #555555;
-}
-
-div.tblBasic table td.indented {
-        text-indent: 30px;
-}
-
-div.tblBasic table.tblCompact td {
-        padding: 3px 3px;
-}
-
-div.tblBasic table tr.lastrow td {
-        border-bottom: none;
-        padding-bottom: 13px;
-}
-
-div.tblBasic table.tblCompact tr.lastrow td {
-        padding-bottom: 3px;
-}
-
-div.tblBasic table tr.lastrow td.colFirstT,
-div.tblBasic table tr.lastrow td.colFirst {
-        background: url(media/img/layout/nav_tbl_btm_lft.png) bottom left no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey th.colLast,
-div.tblBasic table.tblCompact th.colLast {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_rgt.png) top right no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey tr.lastrow td.colLastT,
-div.tblBasic table.tblBasicGrey tr.lastrow td.colLast,
-div.tblBasic table.tblCompact tr.lastrow td.colLast,
-div.tblBasic table.tblCompact tr.lastrow td.colLastT{
-        background: #F5F5F5 url(media/img/layout/nav_tbl_btm_rgt.png) bottom right no-repeat;
-}
-
-div.tblBasic table.tblBasicGrey tr.firstrow td.colLastT,
-div.tblBasic table.tblBasicGrey tr.firstrow td.colLast,
-div tblBasic table.tblCompact tr.firstrow td.colLast {
-        background: #F5F5F5 url(media/img/layout/nav_tbl_top_rgt.png) top right no-repeat;
-}
-
-div.tblBasic table th.colMid,
-div.tblBasic table td.colMid,
-div.tblBasic table th.colLast,
-div.tblBasic table td.colLast {
-        background-color: #F5F5F5 ;
-}
-
-div.tblBasic table th.colLastC,
-div.tblBasic table td.colFirstC,
-div.tblBasic table td.colLastC {
-        text-align: center;
-}
-
-div.tblBasic table th.colLastR,
-div.tblBasic table td.colFirstR,
-div.tblBasic table td.colLastR {
-        text-align: right;
-}
-
-div.tblBasic table td.colFirstT,
-div.tblBasic table td.colMidT,
-div.tblBasic table td.colLastT {
-        vertical-align: top;
-}
-
-div.tblBasic table th.colLastRT,
-div.tblBasic table td.colFirstRT,
-div.tblBasic table td.colLastRT {
-        text-align: right;
-        vertical-align: top;
-}
diff -Nru libpgjava-42.2.4/docs/documentation/changelog.md libpgjava-42.2.5/docs/documentation/changelog.md
--- libpgjava-42.2.4/docs/documentation/changelog.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/changelog.md	2018-08-27 15:38:30.000000000 +0000
@@ -1071,7 +1071,7 @@
 Author: cchantep <chantepie@altern.org>
 Date:   Thu Dec 12 15:54:55 2013 +0100
 
-    Base table more usefull than "" as basic table name
+    Base table more useful than "" as basic table name
 
 
     fixed driver fails to find foreign tables fix from plalg@hotmail.com
@@ -1597,7 +1597,7 @@
 Author: Dave Cramer <davec@fastcrypt.com>
 Date:   Tue Sep 27 11:15:23 2011 +0000
 
-    more jdk 1.4 compatability issues fixed from Mike Fowler
+    more jdk 1.4 compatibility issues fixed from Mike Fowler
 
 Author: Dave Cramer <davec@fastcrypt.com>
 Date:   Mon Sep 26 15:16:05 2011 +0000
@@ -2020,20 +2020,20 @@
 Author: Fiona Tay
 Date:   Sun Jan 20 23:46:31 2013 -0800
 
-    Fix spelling of occured in error message
+    Fix spelling of occurred in error message
     - An error occurred while setting up the SSL connection
 
 Author: Fiona Tay
 Date:   Sun Jan 20 23:45:26 2013 -0800
 
-    Fix spelling of occured in error message
+    Fix spelling of occurred in error message
     - Something unusual has occurred to cause the driver to fail
 
 Author: Fiona Tay
 Date:   Sun Jan 20 23:44:02 2013 -0800
 
-    Fix spelling of occured in error message
-     - An I/O error occured while sending to the backend.
+    Fix spelling of occurred in error message
+     - An I/O error occurred while sending to the backend.
 
 Author: Dave Cramer
 Date:   Fri Jan 11 11:38:17 2013 -0800
@@ -2127,7 +2127,7 @@
 
     Merge pull request #25 from rkrzewski/backend_pid
     
-    Expose PID of the backend process serving a paricular JDBC connection
+    Expose PID of the backend process serving a particular JDBC connection
 
 Author: Dave Cramer
 Date:   Fri Jan 11 05:41:51 2013 -0800
diff -Nru libpgjava-42.2.4/docs/documentation/head/connect.md libpgjava-42.2.5/docs/documentation/head/connect.md
--- libpgjava-42.2.4/docs/documentation/head/connect.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/head/connect.md	2018-08-27 15:38:30.000000000 +0000
@@ -88,18 +88,21 @@
 	establishing a SSL connection. For more information see the section
 	called [“Custom SSLSocketFactory”](ssl-factory.html). 
 
-* **sslfactoryarg** = String
+* **sslfactoryarg** (deprecated) = String
 
 	This value is an optional argument to the constructor of the sslfactory
 	class provided above. For more information see the section called [“Custom SSLSocketFactory”](ssl-factory.html). 
 
 * **sslmode** = String
 
-	possible values include "disable", "require", "verify-ca" and "verify-full", "allow" and "prefer" 
-	will throw an exception. "require" will default to a non validating SSL factory and not check the 
-	validity of the certificates. "verify-ca" and "verify-full" use a validating SSL factory and will 
-	check that the ca is correct and the host is correct. Setting these will necessitate storing the 
-	server certificate on the client machine ["Configuring the client"](ssl-client.html).
+	possible values include `disable`, `allow`, `prefer`, `require`, `verify-ca` and `verify-full`
+	. `require`, `allow` and `prefer` all default to a non validating SSL factory and do not check the
+	validity of the certificate or the host name. `verify-ca` validates the certificate, but does not
+	verify the hostname. `verify-full`  will validate that the certificate is correct and verify the
+	host connected to has the same hostname as the certificate.
+
+	Setting these will necessitate storing the server certificate on the client machine see
+	["Configuring the client"](ssl-client.html) for details.
 
 * **sslcert** = String
 
@@ -117,7 +120,7 @@
 
 * **sslhostnameverifier** = String
 
-	Class name of hostname verifier. Defaults to using `org.postgresql.ssl.jdbc4.LibPQFactory.verify()`
+	Class name of hostname verifier. Defaults to using `org.postgresql.ssl.PGjdbcHostnameVerifier`
 
 * **sslpasswordcallback** = String
 
@@ -408,7 +411,7 @@
 	This class must have a zero argument constructor or a single argument constructor taking a String argument. 
 	This argument may optionally be supplied by `socketFactoryArg`.
 
-* **socketFactoryArg** = String
+* **socketFactoryArg** (deprecated) = String
 
 	This value is an optional argument to the constructor of the socket factory
 	class provided above. 
diff -Nru libpgjava-42.2.4/docs/documentation/head/media/css/table.css libpgjava-42.2.5/docs/documentation/head/media/css/table.css
--- libpgjava-42.2.4/docs/documentation/head/media/css/table.css	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/head/media/css/table.css	2018-08-27 15:38:30.000000000 +0000
@@ -14,7 +14,7 @@
 
 div.tblBasic table th {
         padding-top: 20px;
-        border-bottom: 1px solid #EFEFEF;
+        border-bottom: 1px solid #F0F8FF;
         vertical-align: bottom;
 }
 
@@ -99,3 +99,9 @@
         text-align: right;
         vertical-align: top;
 }
+div.tblBasic table.tblBasicWhite th {
+        background-color: aliceblue;
+}
+div.tblBasic table.tblBasicWhite td {
+        background-color: white;
+}
\ No newline at end of file
diff -Nru libpgjava-42.2.4/docs/documentation/head/ssl-client.md libpgjava-42.2.5/docs/documentation/head/ssl-client.md
--- libpgjava-42.2.4/docs/documentation/head/ssl-client.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/head/ssl-client.md	2018-08-27 15:38:30.000000000 +0000
@@ -9,24 +9,79 @@
 next: ssl-factory.html
 ---
 
-Unlike psql and other libpq based programs the JDBC driver does server certificate
-validation by default.  This means that when establishing a SSL connection the
-JDBC driver will validate the server's identity preventing "man in the middle"
-attacks. It does this by checking that the server certificate is signed by a
-trusted authority. If you have a certificate signed by a global certificate
-authority (CA), there is nothing further to do because Java comes with copies of
-the most common CA's certificates. If you are dealing with a self-signed certificate
-though, you need to make this available to the Java client to enable it to validate
-the server's certificate.
-
-> ### Note
-
-> Only the JDBC driver version 3 and greater  supports SSL. The 1.4 JDK was the 
-first version to come bundled with SSL support. Previous JDK versions that wanted 
-to use SSL could make use of the additional JSSE library, but it does not support 
-the full range of features utilized by the PostgreSQL™ JDBC driver.
+There are a number of connection parameters for configuring the client for SSL. See [SSL Connection parameters](connect.html#ssl)
 
-To make the server certificate available to Java, the first step is to convert
+The simplest being `ssl=true`, passing this into the driver will cause the driver to validate both
+the SSL certificate and verify the hostname (same as `verify-full`). **Note** this is different than
+libpq which defaults to a non-validating SSL connection.
+
+In this mode, when establishing a SSL connection the JDBC driver will validate the server's
+identity preventing "man in the middle" attacks. It does this by checking that the server
+certificate is signed by a trusted authority, and that the host you are connecting to is the
+same as the hostname in the certificate.
+
+If you **require** encryption and want the connection to fail if it can't be encrypted then set
+`sslmode=require` this ensures that the server is configured to accept SSL connections for this
+Host/IP address and that the server recognizes the client certificate. In other words if the server
+does not accept SSL connections or the client certificate is not recognized the connection will fail.
+**Note** in this mode we will accept all server certificates.
+
+If `sslmode=verify-ca`, the server is verified by checking the certificate chain up to the root
+certificate stored on the client.
+
+If `sslmode=verify-full`, the server host name will be verified to make sure it matches the name
+stored in the server certificate.
+
+The SSL connection will fail if the server certificate cannot be verified. `verify-full` is recommended
+in most security-sensitive environments.
+
+
+In the case where the certificate validation is failing you can try `sslcert=` and LibPQFactory will
+not send the client certificate. If the server is not configured to authenticate using the certificate
+it should connect.
+
+The location of the client certificate, client key and root certificate can be overridden with the
+`sslcert`, `sslkey`, and `sslrootcert` settings respectively. These default to /defaultdir/postgresql.crt,
+/defaultdir/postgresql.pk8, and /defaultdir/root.crt respectively where defaultdir is
+${user.home}/.postgresql/ in *nix systems and %appdata%/postgresql/ on windows
+
+Finer control of the SSL connection can be achieved using the `sslmode` connection parameter.
+This parameter is the same as the libpq `sslmode` parameter and the currently SSL implements the
+following
+
+<div class="tblBasic">
+<table class="tblBasicWhite" border="1" summary="SSL Mode Descriptions" cellspacing="0" cellpadding="0">
+<thead>
+<tr>
+  <th>sslmode</th><th>Eavesdropping Protection</th><th> MITM Protection</th><th/>
+</tr>
+</thead>
+<tr>
+  <td>disable</td><td>No</td><td>No</td><td>I don't care about security and don't want to pay the overhead for encryption</td>
+</tr>
+<tr>
+  <td>allow</td><td>Maybe</td><td>No</td><td>I don't care about security but will pay the overhead for encryption if the server insists on it</td>
+</tr>
+<tr>
+  <td>prefer</td><td>Maybe</td><td>No</td><td>I don't care about encryption but will pay the overhead of encryption if the server supports it</td>
+</tr>
+<tr>
+  <td>require</td><td>Yes</td><td>No</td><td>I want my data to be encrypted, and I accept the overhead. I trust that the network will make sure I always connect to the server I want.</td>
+</tr>
+<tr>
+  <td>verify-ca</td><td>Yes</td><td>Depends on CA policy</td><td>I want my data encrypted, and I accept the overhead. I want to be sure that I connect to a server that I trust.</td>
+</tr>
+<tr>
+  <td>verify-full</td><td>Yes</td><td>Yes</td><td>I want my data encrypted, and I accept the overhead. I want to be sure that I connect to a server I trust, and that it's the one I specify.</td>
+</tr>
+</table>
+</div>
+
+
+### Note
+
+If you are using Java's default mechanism (not LibPQFactory) to create the SSL connection you will
+need to make the server certificate available to Java, the first step is to convert
 it to a form Java understands.
 
 `openssl x509 -in server.crt -out server.crt.der -outform der`
@@ -52,9 +107,6 @@
 In the event of problems extra debugging information is available by adding
 `-Djavax.net.debug=ssl` to your command line.
 
-To instruct the JDBC driver to try and establish a SSL connection you must add
-the connection URL parameter `ssl=true`. See [SSL Connection parameters](connect.html#ssl)
-
 <a name="nonvalidating"></a>
 ## Using SSL without Certificate Validation
 
@@ -65,6 +117,6 @@
 an option to establish a SSL connection without doing any validation, but please
 understand the risk involved before enabling this option.
 
-A non-validating connection is established via a custom `SSLSocketFactory` class
-that is provided with the driver. Setting the connection URL parameter `sslfactory=org.postgresql.ssl.NonValidatingFactory`
-will turn off all SSL validation.
\ No newline at end of file
+A non-validating connection is established via a custom `SSLSocketFactory` class that is provided
+with the driver. Setting the connection URL parameter `sslfactory=org.postgresql.ssl.NonValidatingFactory`
+will turn off all SSL validation.
diff -Nru libpgjava-42.2.4/docs/documentation/head/ssl-factory.md libpgjava-42.2.5/docs/documentation/head/ssl-factory.md
--- libpgjava-42.2.4/docs/documentation/head/ssl-factory.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/head/ssl-factory.md	2018-08-27 15:38:30.000000000 +0000
@@ -12,18 +12,15 @@
 PostgreSQL™ provides a way for developers to customize how a SSL connection is
 established. This may be used to provide a custom certificate source or other
 extensions by allowing the developer to create their own `SSLContext` instance.
-The connection URL parameters `sslfactory` and `sslfactoryarg` allow the user
-to specify which custom class to use for creating the `SSLSocketFactory`. The
-class name specified by `sslfactory` must extend `javax.net.ssl.SSLSocketFactory`
-and be available to the driver's classloader. This class must have a zero argument
-constructor or a single argument constructor taking a String argument. This
-argument may optionally be supplied by `sslfactoryarg`.
+The connection URL parameters `sslfactory` allow the user to specify which custom
+class to use for creating the `SSLSocketFactory`. The class name specified by `sslfactory`
+must extend ` javax.net.ssl.SSLSocketFactory` and be available to the driver's classloader.
+
+This class must have a zero argument constructor or a single argument constructor preferentially taking
+a `Properties` argument. There is a simple `org.postgresql.ssl.DefaultJavaSSLFactory` provided which uses the
+default java SSLFactory.
 
 Information on how to actually implement such a class is beyond the scope of this
 documentation. Places to look for help are the [JSSE Reference Guide](https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html)
 and the source to the `NonValidatingFactory` provided by the JDBC driver.
 
-The Java SSL API is not very well known to the JDBC driver developers and we
-would be interested in any interesting and generally useful extensions that you
-have implemented using this mechanism. Specifically it would be nice to be able
-to provide client certificates to be validated by the server.
diff -Nru libpgjava-42.2.4/docs/documentation/head/thread.md libpgjava-42.2.5/docs/documentation/head/thread.md
--- libpgjava-42.2.4/docs/documentation/head/thread.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/documentation/head/thread.md	2018-08-27 15:38:30.000000000 +0000
@@ -16,5 +16,5 @@
 The driver makes no guarantees that methods on connections are synchronized. 
 It will be up to the caller to synchronize calls to the driver.
 
-A noteable exception is org/postgresql/jdbc/TimestampUtils.java which is threadsafe.
- 
\ No newline at end of file
+A notable exception is org/postgresql/jdbc/TimestampUtils.java which is threadsafe.
+ 
diff -Nru libpgjava-42.2.4/docs/_posts/2017-05-04-42.1.0-release.md libpgjava-42.2.5/docs/_posts/2017-05-04-42.1.0-release.md
--- libpgjava-42.2.4/docs/_posts/2017-05-04-42.1.0-release.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/_posts/2017-05-04-42.1.0-release.md	2018-08-27 15:38:30.000000000 +0000
@@ -39,7 +39,7 @@
 
 Jacques Fuentes (1):
 
-* Make replication docs use PREFER_QUERY_MODE [PR 761](https://github.com/pgjdbc/pgjdbc/pull/761) [bd0497de](https://github.com/pgjdbc/pgjdbc/commit/bd0497dee741e92de1cc3eeabb58a82608ed6070)
+* Make replication docs use PREFER\_QUERY\_MODE [PR 761](https://github.com/pgjdbc/pgjdbc/pull/761) [bd0497de](https://github.com/pgjdbc/pgjdbc/commit/bd0497dee741e92de1cc3eeabb58a82608ed6070)
 
 James (1):
 
diff -Nru libpgjava-42.2.4/docs/_posts/2017-07-12-42.1.2-release.md libpgjava-42.2.5/docs/_posts/2017-07-12-42.1.2-release.md
--- libpgjava-42.2.4/docs/_posts/2017-07-12-42.1.2-release.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/_posts/2017-07-12-42.1.2-release.md	2018-08-27 15:38:30.000000000 +0000
@@ -57,7 +57,7 @@
 * fix: use server-prepared statements for batch inserts when prepareThreshold>0 [abc3d9d7](https://github.com/pgjdbc/pgjdbc/commit/abc3d9d7f34a001322fbbe53f25d5e77a33a667f)
 * fix: better parsing for returning keyword [PR 824](https://github.com/pgjdbc/pgjdbc/pull/824) [201daf1d](https://github.com/pgjdbc/pgjdbc/commit/201daf1dc916bbc35e2bbec961aebfd1b1e30bfc)
 * docs: build index, changelog pages from _posts/... to reduce release overhead [d6fe07d7](https://github.com/pgjdbc/pgjdbc/commit/d6fe07d7bb613d7b8fb06ace64b9b37d3f23bbfe)
-* chore: make ./release_notes.sh create docs/_posts/$DATE_YMD-$VERS-release.md file [e00d4571](https://github.com/pgjdbc/pgjdbc/commit/e00d4571bb6ca24c8f93956b59fd1c9a14131394)
+* chore: make ./release\_notes.sh create docs/\_posts/$DATE\_YMD-$VERS-release.md file [e00d4571](https://github.com/pgjdbc/pgjdbc/commit/e00d4571bb6ca24c8f93956b59fd1c9a14131394)
 * docs: add 42.1.2 release notes [6f127a61](https://github.com/pgjdbc/pgjdbc/commit/6f127a61eed5317133ea80f0a06f9441b170a17a)
 
 <a name="contributors_{{ page.version }}"></a>
diff -Nru libpgjava-42.2.4/docs/_posts/2018-01-17-42.2.0-release.md libpgjava-42.2.5/docs/_posts/2018-01-17-42.2.0-release.md
--- libpgjava-42.2.4/docs/_posts/2018-01-17-42.2.0-release.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/_posts/2018-01-17-42.2.0-release.md	2018-08-27 15:38:30.000000000 +0000
@@ -165,7 +165,7 @@
 * fix: prevent statement hang in case close() called when query is in progress [PR 1022](https://github.com/pgjdbc/pgjdbc/pull/1022) [04c5dbb](https://github.com/pgjdbc/pgjdbc/commit/04c5dbb5058008a8ddad0194156af9819595c315)
 * fix: synchronize Statement#result field access to make #close() more thread-safe [4139248](https://github.com/pgjdbc/pgjdbc/commit/41392481d5f2c7f89d783a535ade2d3afb565654)
 * fix: avoid reflective access to TimeZone.defaultTimeZone in Java 9+ [PR 1002](https://github.com/pgjdbc/pgjdbc/pull/1002) [fd0eeee](https://github.com/pgjdbc/pgjdbc/commit/fd0eeee8f123b1355b523425a1e11fdd59b057a5)
-* fix: throw TOO_MANY_RESULTS (0100E) instead of "PgResultSet: tuples must be non-null" [0d31d46](https://github.com/pgjdbc/pgjdbc/commit/0d31d46adff4e9772db843195e1638531bc703e0)
+* fix: throw TOO\_MANY\_RESULTS (0100E) instead of "PgResultSet: tuples must be non-null" [0d31d46](https://github.com/pgjdbc/pgjdbc/commit/0d31d46adff4e9772db843195e1638531bc703e0)
 * fix: "Received resultset tuples, but no field structure for them" when bind failure happens on 5th execution of a statement [PR 811](https://github.com/pgjdbc/pgjdbc/pull/811) [082d009](https://github.com/pgjdbc/pgjdbc/commit/082d00941ad5f8abf44a0785a6f086c106b3c746)
 * tests: correct assertion to use proper column [63918eb](https://github.com/pgjdbc/pgjdbc/commit/63918eb9b1211e0115c8b55401e22c7a3f37e534)
 * fix: add type parameter so code is Java 6/7 compatible [1361c52](https://github.com/pgjdbc/pgjdbc/commit/1361c5208d6afc5d54e4df1053c48cdb31df9038)
diff -Nru libpgjava-42.2.4/docs/_posts/2018-07-12-42.2.3-release.md libpgjava-42.2.5/docs/_posts/2018-07-12-42.2.3-release.md
--- libpgjava-42.2.4/docs/_posts/2018-07-12-42.2.3-release.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/_posts/2018-07-12-42.2.3-release.md	2018-08-27 15:38:30.000000000 +0000
@@ -6,6 +6,8 @@
 version: 42.2.3
 ---
 **Notable changes**
+### Known issues
+- SQL\_TSI\_YEAR is treated as hour, SQL\_TSI\_WEEK is treated as hour, SQL\_TSI\_MINUTE is treated as second (fixed in 42.2.4)
 
 ### Changed
 - Reduce the severity of the error log messages when an exception is re-thrown. The error will be thrown to caller to be dealt with so no need to log at this verbosity by pgjdbc  [PR 1187](https://github.com/pgjdbc/pgjdbc/pull/1187)
@@ -58,7 +60,7 @@
 
 * fix: error on Travis build head [PR 1186](https://github.com/pgjdbc/pgjdbc/pull/1186) [354d2857](https://github.com/pgjdbc/pgjdbc/commit/354d2857664559636a4d3b18568cb69adc47f349)
 * test: add coverage for extendedCacheEverything [PR 1062](https://github.com/pgjdbc/pgjdbc/pull/1062) [f4d503c2](https://github.com/pgjdbc/pgjdbc/commit/f4d503c2ef449e8c2db0c23c27aedb09af30df62)
-* Update after_n_builds to 10 [PR 1193](https://github.com/pgjdbc/pgjdbc/pull/1193) [2f9fed45](https://github.com/pgjdbc/pgjdbc/commit/2f9fed45104b56d7e2b2802359a04321755266a6)
+* Update after\_n\_builds to 10 [PR 1193](https://github.com/pgjdbc/pgjdbc/pull/1193) [2f9fed45](https://github.com/pgjdbc/pgjdbc/commit/2f9fed45104b56d7e2b2802359a04321755266a6)
 * test: drop OpenJ9 CI tests [PR 1196](https://github.com/pgjdbc/pgjdbc/pull/1196) [9b6506df](https://github.com/pgjdbc/pgjdbc/commit/9b6506dfa1076ad27a16de8fc3e85bc23f1a5b97)
 * fix: logger should be generally quiet [PR 1187](https://github.com/pgjdbc/pgjdbc/pull/1187) [30f06e14](https://github.com/pgjdbc/pgjdbc/commit/30f06e1411373d72ab59debc352ddf746f6812da)
 * docs: improve CONTRIBUTING.md [PR 951](https://github.com/pgjdbc/pgjdbc/pull/951) [38c8845e](https://github.com/pgjdbc/pgjdbc/commit/38c8845e645cabce89e7610d1d5e735cc30543b1)
diff -Nru libpgjava-42.2.4/docs/_posts/2018-07-14-42.2.4-release.md libpgjava-42.2.5/docs/_posts/2018-07-14-42.2.4-release.md
--- libpgjava-42.2.4/docs/_posts/2018-07-14-42.2.4-release.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/docs/_posts/2018-07-14-42.2.4-release.md	2018-08-27 15:38:30.000000000 +0000
@@ -12,8 +12,8 @@
 argument if it is not null [PR 1160](https://github.com/pgjdbc/pgjdbc/pull/1160)
 
 ### Fixed
-- Fix treatment of SQL_TSI_YEAR, SQL_TSI_WEEK, SQL_TSI_MINUTE [PR 1250](https://github.com/pgjdbc/pgjdbc/pull/1250)
-- Map integrity constraint violation to XA_RBINTEGRITY instead of XAER_RMFAIL [PR 1175](https://github.com/pgjdbc/pgjdbc/pull/1175) [f2d1352c](https://github.com/pgjdbc/pgjdbc/commit/f2d1352c2b3ea98492beb6127cd6d95039a0b92f)
+- Fix treatment of SQL\_TSI\_YEAR, SQL\_TSI\_WEEK, SQL\_TSI\_MINUTE [PR 1250](https://github.com/pgjdbc/pgjdbc/pull/1250)
+- Map integrity constraint violation to XA\_RBINTEGRITY instead of XAER\_RMFAIL [PR 1175](https://github.com/pgjdbc/pgjdbc/pull/1175) [f2d1352c](https://github.com/pgjdbc/pgjdbc/commit/f2d1352c2b3ea98492beb6127cd6d95039a0b92f)
 
 
 <!--more-->
@@ -32,7 +32,7 @@
 
 Jan Van den Bergh (1):
 
-* fix: map integrity constraint violation to XA_RBINTEGRITY instead of XAER_RMFAIL [PR 1175](https://github.com/pgjdbc/pgjdbc/pull/1175) [f2d1352c](https://github.com/pgjdbc/pgjdbc/commit/f2d1352c2b3ea98492beb6127cd6d95039a0b92f)
+* fix: map integrity constraint violation to XA\_RBINTEGRITY instead of XAER\_RMFAIL [PR 1175](https://github.com/pgjdbc/pgjdbc/pull/1175) [f2d1352c](https://github.com/pgjdbc/pgjdbc/commit/f2d1352c2b3ea98492beb6127cd6d95039a0b92f)
 
 Pavel Raiskup (1):
 
@@ -41,7 +41,7 @@
 Vladimir Sitnikov (2):
 
 * docs: fix broken commit link in 42.2.3 changelog [776e1717](https://github.com/pgjdbc/pgjdbc/commit/776e1717cfe34219dba2f04e2a808d8ca867a860)
-* fix: treatment of SQL_TSI_YEAR, SQL_TSI_WEEK, SQL_TSI_MINUTE [PR 1250](https://github.com/pgjdbc/pgjdbc/pull/1250) [4668f43f](https://github.com/pgjdbc/pgjdbc/commit/4668f43fa11fabce9d12d8c9ade73b9426061284)
+* fix: treatment of SQL\_TSI\_YEAR, SQL\_TSI\_WEEK, SQL\_TSI\_MINUTE [PR 1250](https://github.com/pgjdbc/pgjdbc/pull/1250) [4668f43f](https://github.com/pgjdbc/pgjdbc/commit/4668f43fa11fabce9d12d8c9ade73b9426061284)
 
 <a name="contributors_{{ page.version }}"></a>
 ### Contributors to this release
diff -Nru libpgjava-42.2.4/docs/_posts/2018-08-27-42.2.5-release.md libpgjava-42.2.5/docs/_posts/2018-08-27-42.2.5-release.md
--- libpgjava-42.2.4/docs/_posts/2018-08-27-42.2.5-release.md	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/docs/_posts/2018-08-27-42.2.5-release.md	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,75 @@
+---
+title: PostgreSQL JDBC Driver 42.2.5 Released
+date: 2018-08-27 18:21:38 +0300
+categories:
+  - new_release
+version: 42.2.5
+---
+**Notable changes**
+
+### Changed
+- `ssl=true` implies `sslmode=verify-full`, that is it requires valid server certificate [cdeeaca4](https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e)
+
+### Added
+- Support for `sslmode=allow/prefer/require` [cdeeaca4](https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e)
+
+### Fixed
+- Security: added server hostname verification for non-default SSL factories in `sslmode=verify-full` (CVE-2018-10936) [cdeeaca4](https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e)
+- Updated documentation on SSL configuration [fa032732](https://github.com/pgjdbc/pgjdbc/commit/fa032732acfe51c6e663ee646dd5c1beaa1af857)
+- Updated Japanese translations [PR 1275](https://github.com/pgjdbc/pgjdbc/pull/1275)
+- IndexOutOfBounds on prepared multistatement with insert values [c2885dd0](https://github.com/pgjdbc/pgjdbc/commit/c2885dd0cfc793f81e5dd3ed2300bb32476eb14a)
+
+
+<!--more-->
+
+**Commits by author**
+
+Christoph Berg (1):
+
+* chore: remove editor backup files [PR 1255](https://github.com/pgjdbc/pgjdbc/pull/1255) [b1b1afb8](https://github.com/pgjdbc/pgjdbc/commit/b1b1afb829fae06bcefce443e66d823f4f92fed5)
+
+Dave Cramer (4):
+
+* Update Contributing.md [1f8ac406](https://github.com/pgjdbc/pgjdbc/commit/1f8ac4063b1fd04ccc05616e3533d68be9912333)
+* Add issue templates [PR 1263](https://github.com/pgjdbc/pgjdbc/pull/1263) [c66bf710](https://github.com/pgjdbc/pgjdbc/commit/c66bf7108dd36f50aacebfd4f09e383aed02424b)
+* move issue template and pull request template into github specific di… [PR 1283](https://github.com/pgjdbc/pgjdbc/pull/1283) [b5c19af6](https://github.com/pgjdbc/pgjdbc/commit/b5c19af627c8650410495ad8e3f2ee85e687e3c1)
+* docs: improve documentation on SSL [fa032732](https://github.com/pgjdbc/pgjdbc/commit/fa032732acfe51c6e663ee646dd5c1beaa1af857)
+
+Kazuhiro Sera (1):
+
+* docs: fix typos detected by github.com/client9/misspell [PR 1287](https://github.com/pgjdbc/pgjdbc/pull/1287) [9534e9ca](https://github.com/pgjdbc/pgjdbc/commit/9534e9ca0e1840445ad5f4eee75bc1e2ac102dde)
+
+Kyotaro Horiguchi (1):
+
+* fix: Japanese translation [PR 1275](https://github.com/pgjdbc/pgjdbc/pull/1275) [993a3beb](https://github.com/pgjdbc/pgjdbc/commit/993a3beba10aed73418340b14f2d3420c8984de5)
+
+Sehrope Sarkuni (1):
+
+* fix: Correct typo in CopyManager comment [PR 1285](https://github.com/pgjdbc/pgjdbc/pull/1285) [203a106d](https://github.com/pgjdbc/pgjdbc/commit/203a106ddc9eb0d94cc94838f4fb0924e37f441a)
+
+Vladimir Sitnikov (12):
+
+* reflect 42.2.4 release in readme.md [b99cea0d](https://github.com/pgjdbc/pgjdbc/commit/b99cea0de0e67f0c641c77bcbff8d2889a441290)
+* doc: add SQL_TSI to the known issues for 42.2.3 [ci-skip] [2da319a0](https://github.com/pgjdbc/pgjdbc/commit/2da319a07d47015467bd3ace029827f67f4778bc)
+* docs: escape underscores in changelog otherwise it produces italic [b1507f84](https://github.com/pgjdbc/pgjdbc/commit/b1507f849b732012d5312c79a62dad24fd6a7261)
+* docs: typo in 42.2.3 changelog "minute->second" [5898cdf1](https://github.com/pgjdbc/pgjdbc/commit/5898cdf1e314f2db7889456fb1ad6822021bd543)
+* refactor: remove unused PgPreparedStatement.adjustIndex [PR 1253](https://github.com/pgjdbc/pgjdbc/pull/1253) [178eecc9](https://github.com/pgjdbc/pgjdbc/commit/178eecc90643b36c8c5cd423ff311b26733384f2)
+* test: run testShortQueryTimeout in PG_VERSION=HEAD Travis job only [PR 1270](https://github.com/pgjdbc/pgjdbc/pull/1270) [ecd412e4](https://github.com/pgjdbc/pgjdbc/commit/ecd412e4164bbfcccd96f778c874dd4f40330354)
+* fix: remove POT-Creation-Date from generated .po and .pot files [PR 1269](https://github.com/pgjdbc/pgjdbc/pull/1269) [450a496b](https://github.com/pgjdbc/pgjdbc/commit/450a496be8b14e14fa0821413ed532c49275dc9e)
+* fix: use UTF-8 encoding in generated translation/messages_*.java files [2cbe7b35](https://github.com/pgjdbc/pgjdbc/commit/2cbe7b354543e2ae526c3d9a422949acd0a375b6)
+* fix: typo in "One ore more ClientInfo failed" error message [ci skip] [21e126f4](https://github.com/pgjdbc/pgjdbc/commit/21e126f451df667627c1cc3a0acfb3c38be45ffa)
+* fix: IndexOutOfBounds on prepared multistatement with insert values [PR 1289](https://github.com/pgjdbc/pgjdbc/pull/1289) [c2885dd0](https://github.com/pgjdbc/pgjdbc/commit/c2885dd0cfc793f81e5dd3ed2300bb32476eb14a)
+* security: implement SSL hostname verification for non-default (LibPQFactory) SSL factories (CVE-2018-10936) [cdeeaca4](https://github.com/pgjdbc/pgjdbc/commit/cdeeaca47dc3bc6f727c79a582c9e4123099526e)
+* Update changelog for 42.2.5 [237a89bf](https://github.com/pgjdbc/pgjdbc/commit/237a89bf3058a16a3de37b8c92d2a4d850c6c056)
+
+<a name="contributors_{{ page.version }}"></a>
+### Contributors to this release
+
+We thank the following people for their contributions to this release.
+
+[Christoph Berg](https://github.com/ChristophBerg)  
+[Dave Cramer](davec@postgresintl.com)  
+[Kazuhiro Sera](https://github.com/seratch)  
+[Kyotaro Horiguchi](https://github.com/horiguti)  
+[Sehrope Sarkuni](https://github.com/sehrope)  
+[Vladimir Sitnikov](https://github.com/vlsi)  
diff -Nru libpgjava-42.2.4/.github/issue_template.md libpgjava-42.2.5/.github/issue_template.md
--- libpgjava-42.2.4/.github/issue_template.md	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/.github/issue_template.md	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,30 @@
+**I'm submitting a ...**
+
+  <!--- What kind of an issue is this? Put an `x` in all the boxes that apply: -->
+- [ ] bug report
+- [ ] feature request
+    
+
+**Describe the issue**
+A clear and concise description of what the issue is.
+
+**Java Version**
+
+**OS Version**
+
+**PostgreSQL Version**
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+And what actually happens
+
+**Logs**
+If possible PostgreSQL logs surrounding the occurrence of the issue
+Additionally logs from the driver can be obtained adding
+```java
+loggerLevel=TRACE&loggerFile=pgjdbc-trace.log 
+```
+to the connection string
diff -Nru libpgjava-42.2.4/.github/pull_request_template.md libpgjava-42.2.5/.github/pull_request_template.md
--- libpgjava-42.2.4/.github/pull_request_template.md	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/.github/pull_request_template.md	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,18 @@
+### All Submissions:
+
+* [ ] Have you followed the guidelines in our [Contributing](CONTRIBUTING.md) document?
+* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?
+
+<!-- You can erase any parts of this template not applicable to your Pull Request. -->
+
+### New Feature Submissions:
+
+1. [ ] Does your submission pass tests?
+2. [ ] Does mvn checkstyle:check pass ?
+
+### Changes to Existing Features:
+
+* [ ] Does this break existing behaviour? If so please explain.
+* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
+* [ ] Have you written new tests for your core changes, as applicable?
+* [ ] Have you successfully run tests with your changes locally?
\ No newline at end of file
diff -Nru libpgjava-42.2.4/pgjdbc/pom.xml libpgjava-42.2.5/pgjdbc/pom.xml
--- libpgjava-42.2.4/pgjdbc/pom.xml	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/pom.xml	2018-08-27 15:38:30.000000000 +0000
@@ -10,7 +10,7 @@
   <artifactId>postgresql</artifactId>
   <packaging>bundle</packaging>
   <name>PostgreSQL JDBC Driver - JDBC 4.2</name>
-  <version>42.2.4</version>
+  <version>42.2.5</version>
   <description>Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database</description>
   <url>https://github.com/pgjdbc/pgjdbc</url>
 
@@ -55,7 +55,7 @@
           <plugin>
             <groupId>com.github.vlsi.gettext</groupId>
             <artifactId>gettext-maven-plugin</artifactId>
-            <version>1.2.11</version>
+            <version>1.4.0</version>
             <executions>
               <execution>
                 <id>update_po_with_new_messages</id>
@@ -327,6 +327,6 @@
   </build>
 
   <scm>
-    <tag>REL42.2.4</tag>
+    <tag>REL42.2.5</tag>
   </scm>
 </project>
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/copy/CopyIn.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/copy/CopyIn.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/copy/CopyIn.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/copy/CopyIn.java	2018-08-27 15:38:30.000000000 +0000
@@ -33,7 +33,7 @@
   void flushCopy() throws SQLException;
 
   /**
-   * Finishes copy operation succesfully.
+   * Finishes copy operation successfully.
    *
    * @return number of updated rows for server 8.2 or newer (see getHandledRowCount())
    * @throws SQLException if the operation fails.
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/copy/CopyManager.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/copy/CopyManager.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/copy/CopyManager.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/copy/CopyManager.java	2018-08-27 15:38:30.000000000 +0000
@@ -95,7 +95,7 @@
       if (cp.isActive()) {
         cp.cancelCopy();
       }
-      try { // read until excausted or operation cancelled SQLException
+      try { // read until exhausted or operation cancelled SQLException
         while ((buf = cp.readFromCopy()) != null) {
         }
       } catch (SQLException sqlEx) {
@@ -130,7 +130,7 @@
       if (cp.isActive()) {
         cp.cancelCopy();
       }
-      try { // read until excausted or operation cancelled SQLException
+      try { // read until exhausted or operation cancelled SQLException
         while ((buf = cp.readFromCopy()) != null) {
         }
       } catch (SQLException sqlEx) {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/copy/CopyOperation.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/copy/CopyOperation.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/copy/CopyOperation.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/copy/CopyOperation.java	2018-08-27 15:38:30.000000000 +0000
@@ -42,7 +42,7 @@
   void cancelCopy() throws SQLException;
 
   /**
-   * After succesful end of copy, returns the number of database records handled in that operation.
+   * After successful end of copy, returns the number of database records handled in that operation.
    * Only implemented in PostgreSQL server version 8.2 and up. Otherwise, returns -1.
    *
    * @return number of handled rows or -1
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/Parser.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/Parser.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/Parser.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/Parser.java	2018-08-27 15:38:30.000000000 +0000
@@ -176,6 +176,8 @@
                 bindPositions.clear();
               }
               nativeSql.setLength(0);
+              isValuesFound = false;
+              isCurrentReWriteCompatible = false;
               valuesBraceOpenPosition = -1;
               valuesBraceClosePosition = -1;
               valuesBraceCloseFound = false;
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/PGStream.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/PGStream.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/PGStream.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/PGStream.java	2018-08-27 15:38:30.000000000 +0000
@@ -21,6 +21,7 @@
 import java.io.Writer;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
 import java.sql.SQLException;
 import javax.net.SocketFactory;
 
@@ -109,7 +110,19 @@
    * @throws IOException if something wrong happens
    */
   public boolean hasMessagePending() throws IOException {
-    return pg_input.available() > 0 || connection.getInputStream().available() > 0;
+    if (pg_input.available() > 0) {
+      return true;
+    }
+    // In certain cases, available returns 0, yet there are bytes
+    int soTimeout = getNetworkTimeout();
+    setNetworkTimeout(1);
+    try {
+      return pg_input.peek() != -1;
+    } catch (SocketTimeoutException e) {
+      return false;
+    } finally {
+      setNetworkTimeout(soTimeout);
+    }
   }
 
   /**
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java	2018-08-27 15:38:30.000000000 +0000
@@ -6,6 +6,7 @@
 package org.postgresql.core;
 
 import org.postgresql.PGProperty;
+import org.postgresql.ssl.LibPQFactory;
 import org.postgresql.util.GT;
 import org.postgresql.util.ObjectFactory;
 import org.postgresql.util.PSQLException;
@@ -14,6 +15,7 @@
 import java.util.Properties;
 
 import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocketFactory;
 
 /**
  * Instantiates {@link SocketFactory} based on the {@link PGProperty#SOCKET_FACTORY}.
@@ -43,5 +45,29 @@
           PSQLState.CONNECTION_FAILURE, e);
     }
   }
+
+  /**
+   * Instantiates {@link SSLSocketFactory} based on the {@link PGProperty#SSL_FACTORY}.
+   *
+   * @param info connection properties
+   * @return SSL socket factory
+   * @throws PSQLException if something goes wrong
+   */
+  public static SSLSocketFactory getSslSocketFactory(Properties info) throws PSQLException {
+    String classname = PGProperty.SSL_FACTORY.get(info);
+    if (classname == null
+        || "org.postgresql.ssl.jdbc4.LibPQFactory".equals(classname)
+        || "org.postgresql.ssl.LibPQFactory".equals(classname)) {
+      return new LibPQFactory(info);
+    }
+    try {
+      return (SSLSocketFactory) ObjectFactory.instantiate(classname, info, true,
+          PGProperty.SSL_FACTORY_ARG.get(info));
+    } catch (Exception e) {
+      throw new PSQLException(
+          GT.tr("The SSLSocketFactory class provided {0} could not be instantiated.", classname),
+          PSQLState.CONNECTION_FAILURE, e);
+    }
+  }
 
 }
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java	2018-08-27 15:38:30.000000000 +0000
@@ -21,6 +21,7 @@
 import org.postgresql.hostchooser.HostChooserFactory;
 import org.postgresql.hostchooser.HostRequirement;
 import org.postgresql.hostchooser.HostStatus;
+import org.postgresql.jdbc.SslMode;
 import org.postgresql.sspi.ISSPIClient;
 import org.postgresql.util.GT;
 import org.postgresql.util.HostSpec;
@@ -42,7 +43,6 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-
 import javax.net.SocketFactory;
 
 /**
@@ -82,32 +82,71 @@
     }
   }
 
-  @Override
-  public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, String database,
-      Properties info) throws SQLException {
-    // Extract interesting values from the info properties:
-    // - the SSL setting
-    boolean requireSSL;
-    boolean trySSL;
-    String sslmode = PGProperty.SSL_MODE.get(info);
-    if (sslmode == null) { // Fall back to the ssl property
-      // assume "true" if the property is set but empty
-      requireSSL = trySSL = PGProperty.SSL.getBoolean(info) || "".equals(PGProperty.SSL.get(info));
-    } else {
-      if ("disable".equals(sslmode)) {
-        requireSSL = trySSL = false;
-      } else if ("require".equals(sslmode) || "verify-ca".equals(sslmode)
-          || "verify-full".equals(sslmode)) {
-        requireSSL = trySSL = true;
+  private PGStream tryConnect(String user, String database,
+      Properties info, SocketFactory socketFactory, HostSpec hostSpec,
+      SslMode sslMode)
+      throws SQLException, IOException {
+    int connectTimeout = PGProperty.CONNECT_TIMEOUT.getInt(info) * 1000;
+
+    PGStream newStream = new PGStream(socketFactory, hostSpec, connectTimeout);
+
+    // Construct and send an ssl startup packet if requested.
+    newStream = enableSSL(newStream, sslMode, info, connectTimeout);
+
+    // Set the socket timeout if the "socketTimeout" property has been set.
+    int socketTimeout = PGProperty.SOCKET_TIMEOUT.getInt(info);
+    if (socketTimeout > 0) {
+      newStream.getSocket().setSoTimeout(socketTimeout * 1000);
+    }
+
+    // Enable TCP keep-alive probe if required.
+    boolean requireTCPKeepAlive = PGProperty.TCP_KEEP_ALIVE.getBoolean(info);
+    newStream.getSocket().setKeepAlive(requireTCPKeepAlive);
+
+    // Try to set SO_SNDBUF and SO_RECVBUF socket options, if requested.
+    // If receiveBufferSize and send_buffer_size are set to a value greater
+    // than 0, adjust. -1 means use the system default, 0 is ignored since not
+    // supported.
+
+    // Set SO_RECVBUF read buffer size
+    int receiveBufferSize = PGProperty.RECEIVE_BUFFER_SIZE.getInt(info);
+    if (receiveBufferSize > -1) {
+      // value of 0 not a valid buffer size value
+      if (receiveBufferSize > 0) {
+        newStream.getSocket().setReceiveBufferSize(receiveBufferSize);
       } else {
-        throw new PSQLException(GT.tr("Invalid sslmode value: {0}", sslmode),
-            PSQLState.CONNECTION_UNABLE_TO_CONNECT);
+        LOGGER.log(Level.WARNING, "Ignore invalid value for receiveBufferSize: {0}", receiveBufferSize);
       }
     }
 
-    boolean requireTCPKeepAlive = PGProperty.TCP_KEEP_ALIVE.getBoolean(info);
+    // Set SO_SNDBUF write buffer size
+    int sendBufferSize = PGProperty.SEND_BUFFER_SIZE.getInt(info);
+    if (sendBufferSize > -1) {
+      if (sendBufferSize > 0) {
+        newStream.getSocket().setSendBufferSize(sendBufferSize);
+      } else {
+        LOGGER.log(Level.WARNING, "Ignore invalid value for sendBufferSize: {0}", sendBufferSize);
+      }
+    }
 
-    int connectTimeout = PGProperty.CONNECT_TIMEOUT.getInt(info) * 1000;
+    if (LOGGER.isLoggable(Level.FINE)) {
+      LOGGER.log(Level.FINE, "Receive Buffer Size is {0}", newStream.getSocket().getReceiveBufferSize());
+      LOGGER.log(Level.FINE, "Send Buffer Size is {0}", newStream.getSocket().getSendBufferSize());
+    }
+
+    List<String[]> paramList = getParametersForStartup(user, database, info);
+    sendStartupPacket(newStream, paramList);
+
+    // Do authentication (until AuthenticationOk).
+    doAuthentication(newStream, hostSpec.getHost(), user, info);
+
+    return newStream;
+  }
+
+  @Override
+  public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, String database,
+      Properties info) throws SQLException {
+    SslMode sslMode = SslMode.of(info);
 
     HostRequirement targetServerType;
     String targetServerTypeStr = PGProperty.TARGET_SERVER_TYPE.get(info);
@@ -149,59 +188,62 @@
 
       PGStream newStream = null;
       try {
-        newStream = new PGStream(socketFactory, hostSpec, connectTimeout);
-
-        // Construct and send an ssl startup packet if requested.
-        if (trySSL) {
-          newStream = enableSSL(newStream, requireSSL, info, connectTimeout);
-        }
-
-        // Set the socket timeout if the "socketTimeout" property has been set.
-        int socketTimeout = PGProperty.SOCKET_TIMEOUT.getInt(info);
-        if (socketTimeout > 0) {
-          newStream.getSocket().setSoTimeout(socketTimeout * 1000);
-        }
-
-        // Enable TCP keep-alive probe if required.
-        newStream.getSocket().setKeepAlive(requireTCPKeepAlive);
-
-        // Try to set SO_SNDBUF and SO_RECVBUF socket options, if requested.
-        // If receiveBufferSize and send_buffer_size are set to a value greater
-        // than 0, adjust. -1 means use the system default, 0 is ignored since not
-        // supported.
-
-        // Set SO_RECVBUF read buffer size
-        int receiveBufferSize = PGProperty.RECEIVE_BUFFER_SIZE.getInt(info);
-        if (receiveBufferSize > -1) {
-          // value of 0 not a valid buffer size value
-          if (receiveBufferSize > 0) {
-            newStream.getSocket().setReceiveBufferSize(receiveBufferSize);
-          } else {
-            LOGGER.log(Level.WARNING, "Ignore invalid value for receiveBufferSize: {0}", receiveBufferSize);
-          }
-        }
+        try {
+          newStream = tryConnect(user, database, info, socketFactory, hostSpec, sslMode);
+        } catch (SQLException e) {
+          if (sslMode == SslMode.PREFER
+              && PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState().equals(e.getSQLState())) {
+            // Try non-SSL connection to cover case like "non-ssl only db"
+            // Note: PREFER allows loss of encryption, so no significant harm is made
+            Throwable ex = null;
+            try {
+              newStream =
+                  tryConnect(user, database, info, socketFactory, hostSpec, SslMode.DISABLE);
+              LOGGER.log(Level.FINE, "Downgraded to non-encrypted connection for host {0}",
+                  hostSpec);
+            } catch (SQLException ee) {
+              ex = ee;
+            } catch (IOException ee) {
+              ex = ee; // Can't use multi-catch in Java 6 :(
+            }
+            if (ex != null) {
+              log(Level.FINE, "sslMode==PREFER, however non-SSL connection failed as well", ex);
+              // non-SSL failed as well, so re-throw original exception
+              //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
+              // Add non-SSL exception as suppressed
+              e.addSuppressed(ex);
+              //#endif
+              throw e;
+            }
+          } else if (sslMode == SslMode.ALLOW
+              && PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState().equals(e.getSQLState())) {
+            // Try using SSL
+            Throwable ex = null;
+            try {
+              newStream =
+                  tryConnect(user, database, info, socketFactory, hostSpec, SslMode.REQUIRE);
+              LOGGER.log(Level.FINE, "Upgraded to encrypted connection for host {0}",
+                  hostSpec);
+            } catch (SQLException ee) {
+              ex = ee;
+            } catch (IOException ee) {
+              ex = ee; // Can't use multi-catch in Java 6 :(
+            }
+            if (ex != null) {
+              log(Level.FINE, "sslMode==ALLOW, however SSL connection failed as well", ex);
+              // non-SSL failed as well, so re-throw original exception
+              //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
+              // Add SSL exception as suppressed
+              e.addSuppressed(ex);
+              //#endif
+              throw e;
+            }
 
-        // Set SO_SNDBUF write buffer size
-        int sendBufferSize = PGProperty.SEND_BUFFER_SIZE.getInt(info);
-        if (sendBufferSize > -1) {
-          if (sendBufferSize > 0) {
-            newStream.getSocket().setSendBufferSize(sendBufferSize);
           } else {
-            LOGGER.log(Level.WARNING, "Ignore invalid value for sendBufferSize: {0}", sendBufferSize);
+            throw e;
           }
         }
 
-        if (LOGGER.isLoggable(Level.FINE)) {
-          LOGGER.log(Level.FINE, "Receive Buffer Size is {0}", newStream.getSocket().getReceiveBufferSize());
-          LOGGER.log(Level.FINE, "Send Buffer Size is {0}", newStream.getSocket().getSendBufferSize());
-        }
-
-        List<String[]> paramList = getParametersForStartup(user, database, info);
-        sendStartupPacket(newStream, paramList);
-
-        // Do authentication (until AuthenticationOk).
-        doAuthentication(newStream, hostSpec.getHost(), user, info);
-
         int cancelSignalTimeout = PGProperty.CANCEL_SIGNAL_TIMEOUT.getInt(info) * 1000;
 
         // Do final startup.
@@ -230,8 +272,8 @@
         // we trap this an return a more meaningful message for the end user
         GlobalHostStatusTracker.reportHostStatus(hostSpec, HostStatus.ConnectFail);
         knownStates.put(hostSpec, HostStatus.ConnectFail);
-        log(Level.FINE, "ConnectException occurred while connecting to {0}", cex, hostSpec);
         if (hostIter.hasNext()) {
+          log(Level.FINE, "ConnectException occurred while connecting to {0}", cex, hostSpec);
           // still more addresses to try
           continue;
         }
@@ -242,8 +284,8 @@
         closeStream(newStream);
         GlobalHostStatusTracker.reportHostStatus(hostSpec, HostStatus.ConnectFail);
         knownStates.put(hostSpec, HostStatus.ConnectFail);
-        log(Level.FINE, "IOException occurred while connecting to {0}", ioe, hostSpec);
         if (hostIter.hasNext()) {
+          log(Level.FINE, "IOException occurred while connecting to {0}", ioe, hostSpec);
           // still more addresses to try
           continue;
         }
@@ -251,10 +293,10 @@
             PSQLState.CONNECTION_UNABLE_TO_CONNECT, ioe);
       } catch (SQLException se) {
         closeStream(newStream);
-        log(Level.FINE, "SQLException occurred while connecting to {0}", se, hostSpec);
         GlobalHostStatusTracker.reportHostStatus(hostSpec, HostStatus.ConnectFail);
         knownStates.put(hostSpec, HostStatus.ConnectFail);
         if (hostIter.hasNext()) {
+          log(Level.FINE, "SQLException occurred while connecting to {0}", se, hostSpec);
           // still more addresses to try
           continue;
         }
@@ -340,8 +382,17 @@
     return start + tz.substring(4);
   }
 
-  private PGStream enableSSL(PGStream pgStream, boolean requireSSL, Properties info, int connectTimeout)
-      throws IOException, SQLException {
+  private PGStream enableSSL(PGStream pgStream, SslMode sslMode, Properties info,
+      int connectTimeout)
+      throws IOException, PSQLException {
+    if (sslMode == SslMode.DISABLE) {
+      return pgStream;
+    }
+    if (sslMode == SslMode.ALLOW) {
+      // Allow ==> start with plaintext, use encryption if required by server
+      return pgStream;
+    }
+
     LOGGER.log(Level.FINEST, " FE=> SSLRequest");
 
     // Send SSL request packet
@@ -357,7 +408,7 @@
         LOGGER.log(Level.FINEST, " <=BE SSLError");
 
         // Server doesn't even know about the SSL handshake protocol
-        if (requireSSL) {
+        if (sslMode.requireEncryption()) {
           throw new PSQLException(GT.tr("The server does not support SSL."),
               PSQLState.CONNECTION_REJECTED);
         }
@@ -370,7 +421,7 @@
         LOGGER.log(Level.FINEST, " <=BE SSLRefused");
 
         // Server does not support ssl
-        if (requireSSL) {
+        if (sslMode.requireEncryption()) {
           throw new PSQLException(GT.tr("The server does not support SSL."),
               PSQLState.CONNECTION_REJECTED);
         }
@@ -608,14 +659,19 @@
                 scramAuthenticator = new org.postgresql.jre8.sasl.ScramAuthenticator(user, password, pgStream);
                 scramAuthenticator.processServerMechanismsAndInit();
                 scramAuthenticator.sendScramClientFirstMessage();
-                //#else
-                if (true) {
+                // This works as follows:
+                // 1. When tests is run from IDE, it is assumed SCRAM library is on the classpath
+                // 2. In regular build for Java < 8 this `if` is deactivated and the code always throws
+                if (false) {
+                  //#else
                   throw new PSQLException(GT.tr(
                           "SCRAM authentication is not supported by this driver. You need JDK >= 8 and pgjdbc >= 42.2.0 (not \".jre\" versions)",
                           areq), PSQLState.CONNECTION_REJECTED);
+                  //#endif
+                  //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.2"
                 }
-                //#endif
                 break;
+                //#endif
 
               //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.2"
               case AUTH_REQ_SASL_CONTINUE:
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java	2018-08-27 15:38:30.000000000 +0000
@@ -311,7 +311,7 @@
         // There are three causes of this error, an
         // invalid total Bind message length, a
         // BinaryStream that cannot provide the amount
-        // of data claimed by the length arugment, and
+        // of data claimed by the length argument, and
         // a BinaryStream that throws an Exception
         // when reading.
         //
@@ -414,7 +414,7 @@
   // the server is sending.
   //
   // Our message size estimation is coarse, and disregards asynchronous
-  // notifications, warnings/info/debug messages, etc, so the repsonse size may be
+  // notifications, warnings/info/debug messages, etc, so the response size may be
   // quite different from the 250 bytes assumed here even for queries that don't
   // return data.
   //
@@ -692,7 +692,7 @@
     }
 
     try {
-      while (pgStream.hasMessagePending() || timeoutMillis >= 0 ) {
+      while (timeoutMillis >= 0 || pgStream.hasMessagePending()) {
         if (useTimeout && timeoutMillis >= 0) {
           setSocketTimeout(timeoutMillis);
         }
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleQuery.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleQuery.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleQuery.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleQuery.java	2018-08-27 15:38:30.000000000 +0000
@@ -119,7 +119,7 @@
   }
 
   void setPrepareTypes(int[] paramTypes) {
-    // Remember which parameters were unspecified since the parameters will be overriden later by
+    // Remember which parameters were unspecified since the parameters will be overridden later by
     // ParameterDescription message
     for (int i = 0; i < paramTypes.length; i++) {
       int paramType = paramTypes[i];
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/VisibleBufferedInputStream.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/VisibleBufferedInputStream.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/core/VisibleBufferedInputStream.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/core/VisibleBufferedInputStream.java	2018-08-27 15:38:30.000000000 +0000
@@ -162,7 +162,7 @@
   }
 
   /**
-   * Moves bytes from the buffer to the begining of the destination buffer. Also sets the index and
+   * Moves bytes from the buffer to the beginning of the destination buffer. Also sets the index and
    * endIndex variables.
    *
    * @param dest The destination buffer.
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java	2018-08-27 15:38:30.000000000 +0000
@@ -156,6 +156,8 @@
   }
 
   /**
+   * {@inheritDoc}
+   *
    * <p>Before executing a stored procedure call you must explicitly call registerOutParameter to
    * register the java.sql.Type of each out parameter.</p>
    *
@@ -169,7 +171,8 @@
    *        Decimal use the version of registerOutParameter that accepts a scale value
    * @throws SQLException if a database-access error occurs.
    */
-  public void registerOutParameter(int parameterIndex, int sqlType, boolean setPreparedParameters)
+  @Override
+  public void registerOutParameter(int parameterIndex, int sqlType)
       throws SQLException {
     checkClosed();
     switch (sqlType) {
@@ -191,6 +194,9 @@
       case Types.LONGVARBINARY:
         sqlType = Types.BINARY;
         break;
+      case Types.BOOLEAN:
+        sqlType = Types.BIT;
+        break;
       default:
         break;
     }
@@ -202,9 +208,7 @@
     }
     checkIndex(parameterIndex, false);
 
-    if (setPreparedParameters) {
-      preparedParameters.registerOutParameter(parameterIndex, sqlType);
-    }
+    preparedParameters.registerOutParameter(parameterIndex, sqlType);
     // functionReturnType contains the user supplied value to check
     // testReturn contains a modified version to make it easier to
     // check the getXXX methods..
@@ -220,24 +224,6 @@
     returnTypeSet = true;
   }
 
-  /**
-   * <p>You must also specify the scale for numeric/decimal types.</p>
-   *
-   * <p>Note: When reading the value of an out parameter, you must use the getXXX method whose Java
-   * type XXX corresponds to the parameter's registered SQL type.</p>
-   *
-   * @param parameterIndex the first parameter is 1, the second is 2,...
-   * @param sqlType use either java.sql.Type.NUMERIC or java.sql.Type.DECIMAL
-   * @param scale a value greater than or equal to zero representing the desired number of digits to
-   *        the right of the decimal point
-   * @param setPreparedParameters set prepared parameters
-   * @throws SQLException if a database-access error occurs.
-   */
-  public void registerOutParameter(int parameterIndex, int sqlType, int scale,
-      boolean setPreparedParameters) throws SQLException {
-    registerOutParameter(parameterIndex, sqlType, setPreparedParameters); // ignore for now..
-  }
-
   public boolean wasNull() throws SQLException {
     if (lastIndex == 0) {
       throw new PSQLException(GT.tr("wasNull cannot be call before fetching a result."),
@@ -917,19 +903,6 @@
     throw Driver.notImplemented(this.getClass(), "getURL(String)");
   }
 
-  public void registerOutParameter(int parameterIndex, int sqlType) throws SQLException {
-    // if this isn't 8.1 or we are using protocol version 2 then we don't
-    // register the parameter
-    switch (sqlType) {
-      case Types.BOOLEAN:
-        sqlType = Types.BIT;
-        break;
-      default:
-
-    }
-    registerOutParameter(parameterIndex, sqlType, !adjustIndex);
-  }
-
   public void registerOutParameter(int parameterIndex, int sqlType, int scale) throws SQLException {
     // ignore scale for now
     registerOutParameter(parameterIndex, sqlType);
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java	2018-08-27 15:38:30.000000000 +0000
@@ -1455,7 +1455,7 @@
     }
 
     if (!failures.isEmpty()) {
-      throw new SQLClientInfoException(GT.tr("One ore more ClientInfo failed."),
+      throw new SQLClientInfoException(GT.tr("One or more ClientInfo failed."),
           PSQLState.NOT_IMPLEMENTED.getState(), failures);
     }
   }
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java	2018-08-27 15:38:30.000000000 +0000
@@ -71,13 +71,6 @@
   protected final CachedQuery preparedQuery; // Query fragments for prepared statement.
   protected final ParameterList preparedParameters; // Parameter values for prepared statement.
 
-  /**
-   * Used to differentiate between new function call logic and old function call logic. Will be set
-   * to true if the server is &lt; 8.1 or if we are using v2 protocol. There is an exception to this
-   * where we are using v3, and the call does not have an out parameter before the call.
-   */
-  protected boolean adjustIndex = false;
-
   private TimeZone defaultTimeZone;
 
   PgPreparedStatement(PgConnection connection, String sql, int rsType, int rsConcurrency,
@@ -243,9 +236,6 @@
         // Bad Types value.
         throw new PSQLException(GT.tr("Unknown Types value."), PSQLState.INVALID_PARAMETER_TYPE);
     }
-    if (adjustIndex) {
-      parameterIndex--;
-    }
     preparedParameters.setNull(parameterIndex, oid);
   }
 
@@ -331,9 +321,6 @@
     // if the passed string is null, then set this column to null
     checkClosed();
     if (x == null) {
-      if (adjustIndex) {
-        parameterIndex--;
-      }
       preparedParameters.setNull(parameterIndex, oid);
     } else {
       bindString(parameterIndex, x, oid);
@@ -989,16 +976,10 @@
    * @throws SQLException if something goes wrong
    */
   protected void bindLiteral(int paramIndex, String s, int oid) throws SQLException {
-    if (adjustIndex) {
-      paramIndex--;
-    }
     preparedParameters.setLiteralParameter(paramIndex, s, oid);
   }
 
   protected void bindBytes(int paramIndex, byte[] b, int oid) throws SQLException {
-    if (adjustIndex) {
-      paramIndex--;
-    }
     preparedParameters.setBinaryParameter(paramIndex, b, oid);
   }
 
@@ -1012,9 +993,6 @@
    * @throws SQLException if something goes wrong
    */
   private void bindString(int paramIndex, String s, int oid) throws SQLException {
-    if (adjustIndex) {
-      paramIndex--;
-    }
     preparedParameters.setStringParameter(paramIndex, s, oid);
   }
 
@@ -1233,7 +1211,6 @@
   }
 
   public void setNull(int parameterIndex, int t, String typeName) throws SQLException {
-
     if (typeName == null) {
       setNull(parameterIndex, t);
       return;
@@ -1242,15 +1219,9 @@
     checkClosed();
 
     TypeInfo typeInfo = connection.getTypeInfo();
-
     int oid = typeInfo.getPGType(typeName);
 
-    if (adjustIndex) {
-      parameterIndex--;
-    }
-
     preparedParameters.setNull(parameterIndex, oid);
-
   }
 
   public void setRef(int i, Ref x) throws SQLException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java	2018-08-27 15:38:30.000000000 +0000
@@ -1557,7 +1557,7 @@
 
     primaryKeys = new ArrayList<PrimaryKey>();
 
-    // this is not stricty jdbc spec, but it will make things much faster if used
+    // this is not strictly jdbc spec, but it will make things much faster if used
     // the user has to select oid, * from table and then we will just use oid
 
 
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/SslMode.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/SslMode.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/jdbc/SslMode.java	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/jdbc/SslMode.java	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2018, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.jdbc;
+
+import org.postgresql.PGProperty;
+import org.postgresql.util.GT;
+import org.postgresql.util.PSQLException;
+import org.postgresql.util.PSQLState;
+
+import java.util.Properties;
+
+public enum SslMode {
+  /**
+   * Do not use encrypted connections.
+   */
+  DISABLE("disable"),
+  /**
+   * Start with non-encrypted connection, then try encrypted one.
+   */
+  ALLOW("allow"),
+  /**
+   * Start with encrypted connection, fallback to non-encrypted (default).
+   */
+  PREFER("prefer"),
+  /**
+   * Ensure connection is encrypted.
+   */
+  REQUIRE("require"),
+  /**
+   * Ensure connection is encrypted, and client trusts server certificate.
+   */
+  VERIFY_CA("verify-ca"),
+  /**
+   * Ensure connection is encrypted, client trusts server certificate, and server hostname matches
+   * the one listed in the server certificate.
+   */
+  VERIFY_FULL("verify-full"),
+  ;
+
+  public static final SslMode[] VALUES = values();
+
+  public final String value;
+
+  SslMode(String value) {
+    this.value = value;
+  }
+
+  public boolean requireEncryption() {
+    return this.compareTo(REQUIRE) >= 0;
+  }
+
+  public boolean verifyCertificate() {
+    return this == VERIFY_CA || this == VERIFY_FULL;
+  }
+
+  public boolean verifyPeerName() {
+    return this == VERIFY_FULL;
+  }
+
+  public static SslMode of(Properties info) throws PSQLException {
+    String sslmode = PGProperty.SSL_MODE.get(info);
+    // If sslmode is not set, fallback to ssl parameter
+    if (sslmode == null) {
+      if (PGProperty.SSL.getBoolean(info) || "".equals(PGProperty.SSL.get(info))) {
+        return VERIFY_FULL;
+      }
+      return PREFER;
+    }
+
+    for (SslMode sslMode : VALUES) {
+      if (sslMode.value.equalsIgnoreCase(sslmode)) {
+        return sslMode;
+      }
+    }
+    throw new PSQLException(GT.tr("Invalid sslmode value: {0}", sslmode),
+        PSQLState.CONNECTION_UNABLE_TO_CONNECT);
+  }
+}
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/largeobject/LargeObject.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/largeobject/LargeObject.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/largeobject/LargeObject.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/largeobject/LargeObject.java	2018-08-27 15:38:30.000000000 +0000
@@ -44,7 +44,7 @@
     //#endif
     /* hi, checkstyle */ {
   /**
-   * Indicates a seek from the begining of a file.
+   * Indicates a seek from the beginning of a file.
    */
   public static final int SEEK_SET = 0;
 
@@ -279,7 +279,7 @@
    * <p>This is similar to the fseek() call in the standard C library. It allows you to have random
    * access to the large object.</p>
    *
-   * @param pos position within object from begining
+   * @param pos position within object from beginning
    * @throws SQLException if a database-access error occurs.
    */
   public void seek(int pos) throws SQLException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/PGProperty.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/PGProperty.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/PGProperty.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/PGProperty.java	2018-08-27 15:38:30.000000000 +0000
@@ -173,17 +173,18 @@
       "Enable optimization that disables column name sanitiser"),
 
   /**
-   * Control use of SSL (any non-null value causes SSL to be required).
+   * Control use of SSL: empty or {@code true} values imply {@code sslmode==verify-full}
    */
   SSL("ssl", null, "Control use of SSL (any non-null value causes SSL to be required)"),
 
   /**
-   * Parameter governing the use of SSL. The allowed values are {@code require}, {@code verify-ca},
-   * {@code verify-full}, or {@code disable} ({@code allow} and {@code prefer} are not implemented)
-   * If not set, the {@code ssl} property may be checked to enable SSL mode.
+   * Parameter governing the use of SSL. The allowed values are {@code disable}, {@code allow},
+   * {@code prefer}, {@code require}, {@code verify-ca}, {@code verify-full}.
+   * If {@code ssl} property is empty or set to {@code true} it implies {@code verify-full}.
+   * Default mode is "require"
    */
-  SSL_MODE("sslmode", null, "Parameter governing the use of SSL",false,
-      "disable", "require", "verify-ca", "verify-full"),
+  SSL_MODE("sslmode", null, "Parameter governing the use of SSL", false,
+      "disable", "allow", "prefer", "require", "verify-ca", "verify-full"),
 
   /**
    * Classname of the SSL Factory to use (instance of {@code javax.net.ssl.SSLSocketFactory}).
@@ -192,7 +193,9 @@
 
   /**
    * The String argument to give to the constructor of the SSL Factory.
+   * @deprecated use {@code ..Factory(Properties)} constructor.
    */
+  @Deprecated
   SSL_FACTORY_ARG("sslfactoryarg", null,
       "Argument forwarded to constructor of SSLSocketFactory class."),
 
@@ -279,7 +282,9 @@
 
   /**
    * The String argument to give to the constructor of the Socket Factory.
+   * @deprecated use {@code ..Factory(Properties)} constructor.
    */
+  @Deprecated
   SOCKET_FACTORY_ARG("socketFactoryArg", null,
       "Argument forwarded to constructor of SocketFactory class."),
 
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/replication/fluent/ChainedCommonStreamBuilder.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/replication/fluent/ChainedCommonStreamBuilder.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/replication/fluent/ChainedCommonStreamBuilder.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/replication/fluent/ChainedCommonStreamBuilder.java	2018-08-27 15:38:30.000000000 +0000
@@ -37,7 +37,7 @@
   T withStatusInterval(int time, TimeUnit format);
 
   /**
-   * Specify start position from wich backend will start stream changes. If parameter will not
+   * Specify start position from which backend will start stream changes. If parameter will not
    * specify, streaming starts from restart_lsn. For more details see pg_replication_slots
    * description.
    *
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/DefaultJavaSSLFactory.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/DefaultJavaSSLFactory.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/DefaultJavaSSLFactory.java	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/DefaultJavaSSLFactory.java	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2017, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.ssl;
+
+import java.util.Properties;
+import javax.net.ssl.SSLSocketFactory;
+
+/**
+ * Socket factory that uses Java's default truststore to validate server certificate.
+ * Note: it always validates server certificate, so it might result to downgrade to non-encrypted
+ * connection when default truststore lacks certificates to validate server.
+ */
+public class DefaultJavaSSLFactory extends WrappedFactory {
+  public DefaultJavaSSLFactory(Properties info) {
+    _factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
+  }
+}
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LazyKeyManager.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LazyKeyManager.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LazyKeyManager.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LazyKeyManager.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2004, PostgreSQL Global Development Group
- * See the LICENSE file in the project root for more information.
- */
-
-package org.postgresql.ssl.jdbc4;
-
-import org.postgresql.util.GT;
-import org.postgresql.util.PSQLException;
-import org.postgresql.util.PSQLState;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.net.Socket;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Collection;
-
-import javax.crypto.Cipher;
-import javax.crypto.EncryptedPrivateKeyInfo;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.net.ssl.X509KeyManager;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.x500.X500Principal;
-
-/**
- * A Key manager that only loads the keys, if necessary.
- */
-public class LazyKeyManager implements X509KeyManager {
-  private X509Certificate[] cert = null;
-  private PrivateKey key = null;
-  private String certfile;
-  private String keyfile;
-  private CallbackHandler cbh;
-  private boolean defaultfile;
-  private PSQLException error = null;
-
-  /**
-   * Constructor. certfile and keyfile can be null, in that case no certificate is presented to the
-   * server.
-   *
-   * @param certfile certfile
-   * @param keyfile key file
-   * @param cbh callback handler
-   * @param defaultfile default file
-   */
-  public LazyKeyManager(String certfile, String keyfile, CallbackHandler cbh, boolean defaultfile) {
-    this.certfile = certfile;
-    this.keyfile = keyfile;
-    this.cbh = cbh;
-    this.defaultfile = defaultfile;
-  }
-
-  /**
-   * getCertificateChain and getPrivateKey cannot throw exeptions, therefore any exception is stored
-   * in {@link #error} and can be raised by this method.
-   *
-   * @throws PSQLException if any exception is stored in {@link #error} and can be raised
-   */
-  public void throwKeyManagerException() throws PSQLException {
-    if (error != null) {
-      throw error;
-    }
-  }
-
-  @Override
-  public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
-    if (certfile == null) {
-      return null;
-    } else {
-      if (issuers == null || issuers.length == 0) {
-        // Postgres 8.4 and earlier do not send the list of accepted certificate authorities
-        // to the client. See BUG #5468. We only hope, that our certificate will be accepted.
-        return "user";
-      } else {
-        // Sending a wrong certificate makes the connection rejected, even, if clientcert=0 in
-        // pg_hba.conf.
-        // therefore we only send our certificate, if the issuer is listed in issuers
-        X509Certificate[] certchain = getCertificateChain("user");
-        if (certchain == null) {
-          return null;
-        } else {
-          X500Principal ourissuer = certchain[certchain.length - 1].getIssuerX500Principal();
-          boolean found = false;
-          for (Principal issuer : issuers) {
-            if (ourissuer.equals(issuer)) {
-              found = true;
-            }
-          }
-          return (found ? "user" : null);
-        }
-      }
-    }
-  }
-
-  @Override
-  public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
-    return null; // We are not a server
-  }
-
-  @Override
-  public X509Certificate[] getCertificateChain(String alias) {
-    if (cert == null && certfile != null) {
-      // If certfile is null, we do not load the certificate
-      // The certificate must be loaded
-      CertificateFactory cf;
-      try {
-        cf = CertificateFactory.getInstance("X.509");
-      } catch (CertificateException ex) {
-        // For some strange reason it throws CertificateException instead of
-        // NoSuchAlgorithmException...
-        error = new PSQLException(GT.tr(
-            "Could not find a java cryptographic algorithm: X.509 CertificateFactory not available."),
-            PSQLState.CONNECTION_FAILURE, ex);
-        return null;
-      }
-      Collection<? extends Certificate> certs;
-      try {
-        certs = cf.generateCertificates(new FileInputStream(certfile));
-      } catch (FileNotFoundException ioex) {
-        if (!defaultfile) { // It is not an error if there is no file at the default location
-          error = new PSQLException(
-              GT.tr("Could not open SSL certificate file {0}.", certfile),
-              PSQLState.CONNECTION_FAILURE, ioex);
-        }
-        return null;
-      } catch (CertificateException gsex) {
-        error = new PSQLException(GT.tr("Loading the SSL certificate {0} into a KeyManager failed.",
-            certfile), PSQLState.CONNECTION_FAILURE, gsex);
-        return null;
-      }
-      cert = certs.toArray(new X509Certificate[certs.size()]);
-    }
-    return cert;
-  }
-
-  @Override
-  public String[] getClientAliases(String keyType, Principal[] issuers) {
-    String alias = chooseClientAlias(new String[]{keyType}, issuers, (Socket) null);
-    return (alias == null ? new String[]{} : new String[]{alias});
-  }
-
-  @Override
-  public PrivateKey getPrivateKey(String alias) {
-    RandomAccessFile raf = null;
-    try {
-      if (key == null && keyfile != null) {
-        // If keyfile is null, we do not load the key
-        // The private key must be loaded
-        if (cert == null) { // We need the certificate for the algorithm
-          if (getCertificateChain("user") == null) {
-            return null; // getCertificateChain failed...
-          }
-        }
-
-        try {
-          raf = new RandomAccessFile(new File(keyfile), "r"); // NOSONAR
-        } catch (FileNotFoundException ex) {
-          if (!defaultfile) {
-            // It is not an error if there is no file at the default location
-            throw ex;
-          }
-          return null;
-        }
-        byte[] keydata = new byte[(int) raf.length()];
-        raf.readFully(keydata);
-        raf.close();
-        raf = null;
-
-        KeyFactory kf = KeyFactory.getInstance(cert[0].getPublicKey().getAlgorithm());
-        try {
-          KeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keydata);
-          key = kf.generatePrivate(pkcs8KeySpec);
-        } catch (InvalidKeySpecException ex) {
-          // The key might be password protected
-          EncryptedPrivateKeyInfo ePKInfo = new EncryptedPrivateKeyInfo(keydata);
-          Cipher cipher;
-          try {
-            cipher = Cipher.getInstance(ePKInfo.getAlgName());
-          } catch (NoSuchPaddingException npex) {
-            // Why is it not a subclass of NoSuchAlgorithmException?
-            throw new NoSuchAlgorithmException(npex.getMessage(), npex);
-          }
-          // We call back for the password
-          PasswordCallback pwdcb = new PasswordCallback(GT.tr("Enter SSL password: "), false);
-          try {
-            cbh.handle(new Callback[]{pwdcb});
-          } catch (UnsupportedCallbackException ucex) {
-            if ((cbh instanceof LibPQFactory.ConsoleCallbackHandler)
-                && ("Console is not available".equals(ucex.getMessage()))) {
-              error = new PSQLException(GT
-                  .tr("Could not read password for SSL key file, console is not available."),
-                  PSQLState.CONNECTION_FAILURE, ucex);
-            } else {
-              error =
-                  new PSQLException(
-                      GT.tr("Could not read password for SSL key file by callbackhandler {0}.",
-                              cbh.getClass().getName()),
-                      PSQLState.CONNECTION_FAILURE, ucex);
-            }
-            return null;
-          }
-          try {
-            PBEKeySpec pbeKeySpec = new PBEKeySpec(pwdcb.getPassword());
-            // Now create the Key from the PBEKeySpec
-            SecretKeyFactory skFac = SecretKeyFactory.getInstance(ePKInfo.getAlgName());
-            Key pbeKey = skFac.generateSecret(pbeKeySpec);
-            // Extract the iteration count and the salt
-            AlgorithmParameters algParams = ePKInfo.getAlgParameters();
-            cipher.init(Cipher.DECRYPT_MODE, pbeKey, algParams);
-            // Decrypt the encryped private key into a PKCS8EncodedKeySpec
-            KeySpec pkcs8KeySpec = ePKInfo.getKeySpec(cipher);
-            key = kf.generatePrivate(pkcs8KeySpec);
-          } catch (GeneralSecurityException ikex) {
-            error = new PSQLException(
-                GT.tr("Could not decrypt SSL key file {0}.", keyfile),
-                PSQLState.CONNECTION_FAILURE, ikex);
-            return null;
-          }
-        }
-      }
-    } catch (IOException ioex) {
-      if (raf != null) {
-        try {
-          raf.close();
-        } catch (IOException ex) {
-        }
-      }
-
-      error = new PSQLException(GT.tr("Could not read SSL key file {0}.", keyfile),
-          PSQLState.CONNECTION_FAILURE, ioex);
-    } catch (NoSuchAlgorithmException ex) {
-      error = new PSQLException(GT.tr("Could not find a java cryptographic algorithm: {0}.",
-              ex.getMessage()), PSQLState.CONNECTION_FAILURE, ex);
-      return null;
-    }
-
-    return key;
-  }
-
-  @Override
-  public String[] getServerAliases(String keyType, Principal[] issuers) {
-    return new String[]{};
-  }
-}
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java	2018-08-27 15:38:30.000000000 +0000
@@ -1,270 +1,63 @@
 /*
- * Copyright (c) 2004, PostgreSQL Global Development Group
+ * Copyright (c) 2017, PostgreSQL Global Development Group
  * See the LICENSE file in the project root for more information.
  */
 
 package org.postgresql.ssl.jdbc4;
 
-import org.postgresql.PGProperty;
-import org.postgresql.ssl.MakeSSL;
-import org.postgresql.ssl.NonValidatingFactory.NonValidatingTM;
-import org.postgresql.ssl.WrappedFactory;
-import org.postgresql.util.GT;
+import org.postgresql.jdbc.SslMode;
+import org.postgresql.ssl.PGjdbcHostnameVerifier;
 import org.postgresql.util.PSQLException;
-import org.postgresql.util.PSQLState;
 
-import java.io.Console;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-import java.util.List;
+import java.net.IDN;
 import java.util.Properties;
-
-import javax.naming.InvalidNameException;
-import javax.naming.ldap.LdapName;
-import javax.naming.ldap.Rdn;
 import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.x500.X500Principal;
 
 /**
- * Provide an SSLSocketFactory that is compatible with the libpq behaviour.
+ * @deprecated prefer {@link org.postgresql.ssl.LibPQFactory}
  */
-public class LibPQFactory extends WrappedFactory implements HostnameVerifier {
-
-  private static final int ALT_DNS_NAME = 2;
-
-  LazyKeyManager km = null;
-  String sslmode;
+@Deprecated
+public class LibPQFactory extends org.postgresql.ssl.LibPQFactory implements HostnameVerifier {
+  private final SslMode sslMode;
 
   /**
    * @param info the connection parameters The following parameters are used:
-   *        sslmode,sslcert,sslkey,sslrootcert,sslhostnameverifier,sslpasswordcallback,sslpassword
+   *             sslmode,sslcert,sslkey,sslrootcert,sslhostnameverifier,sslpasswordcallback,sslpassword
    * @throws PSQLException if security error appears when initializing factory
+   * @deprecated prefer {@link org.postgresql.ssl.LibPQFactory}
    */
+  @Deprecated
   public LibPQFactory(Properties info) throws PSQLException {
-    try {
-      sslmode = PGProperty.SSL_MODE.get(info);
-      SSLContext ctx = SSLContext.getInstance("TLS"); // or "SSL" ?
-
-      // Determinig the default file location
-      String pathsep = System.getProperty("file.separator");
-      String defaultdir;
-      boolean defaultfile = false;
-      if (System.getProperty("os.name").toLowerCase().contains("windows")) { // It is Windows
-        defaultdir = System.getenv("APPDATA") + pathsep + "postgresql" + pathsep;
-      } else {
-        defaultdir = System.getProperty("user.home") + pathsep + ".postgresql" + pathsep;
-      }
-
-      // Load the client's certificate and key
-      String sslcertfile = PGProperty.SSL_CERT.get(info);
-      if (sslcertfile == null) { // Fall back to default
-        defaultfile = true;
-        sslcertfile = defaultdir + "postgresql.crt";
-      }
-      String sslkeyfile = PGProperty.SSL_KEY.get(info);
-      if (sslkeyfile == null) { // Fall back to default
-        defaultfile = true;
-        sslkeyfile = defaultdir + "postgresql.pk8";
-      }
-
-      // Determine the callback handler
-      CallbackHandler cbh;
-      String sslpasswordcallback = PGProperty.SSL_PASSWORD_CALLBACK.get(info);
-      if (sslpasswordcallback != null) {
-        try {
-          cbh = (CallbackHandler) MakeSSL.instantiate(sslpasswordcallback, info, false, null);
-        } catch (Exception e) {
-          throw new PSQLException(
-              GT.tr("The password callback class provided {0} could not be instantiated.",
-                  sslpasswordcallback),
-              PSQLState.CONNECTION_FAILURE, e);
-        }
-      } else {
-        cbh = new ConsoleCallbackHandler(PGProperty.SSL_PASSWORD.get(info));
-      }
-
-      // If the properties are empty, give null to prevent client key selection
-      km = new LazyKeyManager(("".equals(sslcertfile) ? null : sslcertfile),
-          ("".equals(sslkeyfile) ? null : sslkeyfile), cbh, defaultfile);
-
-      TrustManager[] tm;
-      if ("verify-ca".equals(sslmode) || "verify-full".equals(sslmode)) {
-        // Load the server certificate
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-        KeyStore ks;
-        try {
-          ks = KeyStore.getInstance("jks");
-        } catch (KeyStoreException e) {
-          // this should never happen
-          throw new NoSuchAlgorithmException("jks KeyStore not available");
-        }
-        String sslrootcertfile = PGProperty.SSL_ROOT_CERT.get(info);
-        if (sslrootcertfile == null) { // Fall back to default
-          sslrootcertfile = defaultdir + "root.crt";
-        }
-        FileInputStream fis;
-        try {
-          fis = new FileInputStream(sslrootcertfile); // NOSONAR
-        } catch (FileNotFoundException ex) {
-          throw new PSQLException(
-              GT.tr("Could not open SSL root certificate file {0}.", sslrootcertfile),
-              PSQLState.CONNECTION_FAILURE, ex);
-        }
-        try {
-          CertificateFactory cf = CertificateFactory.getInstance("X.509");
-          // Certificate[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{}); //Does
-          // not work in java 1.4
-          Object[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{});
-          ks.load(null, null);
-          for (int i = 0; i < certs.length; i++) {
-            ks.setCertificateEntry("cert" + i, (Certificate) certs[i]);
-          }
-          tmf.init(ks);
-        } catch (IOException ioex) {
-          throw new PSQLException(
-              GT.tr("Could not read SSL root certificate file {0}.", sslrootcertfile),
-              PSQLState.CONNECTION_FAILURE, ioex);
-        } catch (GeneralSecurityException gsex) {
-          throw new PSQLException(
-              GT.tr("Loading the SSL root certificate {0} into a TrustManager failed.",
-                      sslrootcertfile),
-              PSQLState.CONNECTION_FAILURE, gsex);
-        } finally {
-          try {
-            fis.close();
-          } catch (IOException e) {
-            /* ignore */
-          }
-        }
-        tm = tmf.getTrustManagers();
-      } else { // server validation is not required
-        tm = new TrustManager[]{new NonValidatingTM()};
-      }
+    super(info);
 
-      // finally we can initialize the context
-      try {
-        ctx.init(new KeyManager[]{km}, tm, null);
-      } catch (KeyManagementException ex) {
-        throw new PSQLException(GT.tr("Could not initialize SSL context."),
-            PSQLState.CONNECTION_FAILURE, ex);
-      }
-
-      _factory = ctx.getSocketFactory();
-    } catch (NoSuchAlgorithmException ex) {
-      throw new PSQLException(GT.tr("Could not find a java cryptographic algorithm: {0}.",
-              ex.getMessage()), PSQLState.CONNECTION_FAILURE, ex);
-    }
+    sslMode = SslMode.of(info);
   }
 
   /**
-   * Propagates any exception from {@link LazyKeyManager}.
+   * Verifies if given hostname matches pattern.
    *
-   * @throws PSQLException if there is an exception to propagate
+   * @deprecated use {@link PGjdbcHostnameVerifier}
+   * @param hostname input hostname
+   * @param pattern domain name pattern
+   * @return true when domain matches pattern
    */
-  public void throwKeyManagerException() throws PSQLException {
-    if (km != null) {
-      km.throwKeyManagerException();
-    }
-  }
-
-  /**
-   * A CallbackHandler that reads the password from the console or returns the password given to its
-   * constructor.
-   */
-  static class ConsoleCallbackHandler implements CallbackHandler {
-
-    private char[] password = null;
-
-    ConsoleCallbackHandler(String password) {
-      if (password != null) {
-        this.password = password.toCharArray();
-      }
-    }
-
-    /**
-     * Handles the callbacks.
-     *
-     * @param callbacks The callbacks to handle
-     * @throws UnsupportedCallbackException If the console is not available or other than
-     *         PasswordCallback is supplied
-     */
-    @Override
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-      Console cons = System.console();
-      if (cons == null && password == null) {
-        throw new UnsupportedCallbackException(callbacks[0], "Console is not available");
-      }
-      for (Callback callback : callbacks) {
-        if (callback instanceof PasswordCallback) {
-          if (password == null) {
-            // It is used instead of cons.readPassword(prompt), because the prompt may contain '%'
-            // characters
-            ((PasswordCallback) callback).setPassword(
-                cons.readPassword("%s", ((PasswordCallback) callback).getPrompt()));
-          } else {
-            ((PasswordCallback) callback).setPassword(password);
-          }
-        } else {
-          throw new UnsupportedCallbackException(callback);
-        }
-      }
-
-    }
-  }
-
+  @Deprecated
   public static boolean verifyHostName(String hostname, String pattern) {
-    if (hostname == null || pattern == null) {
-      return false;
-    }
-    if (!pattern.startsWith("*")) {
-      // No wildcard => just compare hostnames
-      return hostname.equalsIgnoreCase(pattern);
-    }
-    // pattern starts with *, so hostname should be at least (pattern.length-1) long
-    if (hostname.length() < pattern.length() - 1) {
-      return false;
-    }
-    // Compare ignore case
-    final boolean ignoreCase = true;
-    // Below code is "hostname.endsWithIgnoreCase(pattern.withoutFirstStar())"
-
-    // E.g. hostname==sub.host.com; pattern==*.host.com
-    // We need to start the offset of ".host.com" in hostname
-    // For this we take hostname.length() - pattern.length()
-    // and +1 is required since pattern is known to start with *
-    int toffset = hostname.length() - pattern.length() + 1;
-
-    // Wildcard covers just one domain level
-    // a.b.c.com should not be covered by *.c.com
-    if (hostname.lastIndexOf('.', toffset - 1) >= 0) {
-      // If there's a dot in between 0..toffset
-      return false;
+    String canonicalHostname;
+    if (hostname.startsWith("[") && hostname.endsWith("]")) {
+      // IPv6 address like [2001:db8:0:1:1:1:1:1]
+      canonicalHostname = hostname.substring(1, hostname.length() - 1);
+    } else {
+      // This converts unicode domain name to ASCII
+      try {
+        canonicalHostname = IDN.toASCII(hostname);
+      } catch (IllegalArgumentException e) {
+        // e.g. hostname is invalid
+        return false;
+      }
     }
-
-    return hostname.regionMatches(ignoreCase, toffset,
-        pattern, 1, pattern.length() - 1);
+    return PGjdbcHostnameVerifier.INSTANCE.verifyHostName(canonicalHostname, pattern);
   }
 
   /**
@@ -274,56 +67,18 @@
    * the certificate will not match subdomains. If the connection is made using an IP address
    * instead of a hostname, the IP address will be matched (without doing any DNS lookups).
    *
+   * @deprecated use PgjdbcHostnameVerifier
    * @param hostname Hostname or IP address of the server.
    * @param session The SSL session.
    * @return true if the certificate belongs to the server, false otherwise.
+   * @see PGjdbcHostnameVerifier
    */
+  @Deprecated
   public boolean verify(String hostname, SSLSession session) {
-    X509Certificate[] peerCerts;
-    try {
-      peerCerts = (X509Certificate[]) session.getPeerCertificates();
-    } catch (SSLPeerUnverifiedException e) {
-      return false;
+    if (!sslMode.verifyPeerName()) {
+      return true;
     }
-    if (peerCerts == null || peerCerts.length == 0) {
-      return false;
-    }
-    // Extract the common name
-    X509Certificate serverCert = peerCerts[0];
-
-    try {
-      // Check for Subject Alternative Names (see RFC 6125)
-      Collection<List<?>> subjectAltNames = serverCert.getSubjectAlternativeNames();
-
-      if (subjectAltNames != null) {
-        for (List<?> sanit : subjectAltNames) {
-          Integer type = (Integer) sanit.get(0);
-          String san = (String) sanit.get(1);
-
-          // this mimics libpq check for ALT_DNS_NAME
-          if (type != null && type == ALT_DNS_NAME && verifyHostName(hostname, san)) {
-            return true;
-          }
-        }
-      }
-    } catch (CertificateParsingException e) {
-      return false;
-    }
-
-    LdapName DN;
-    try {
-      DN = new LdapName(serverCert.getSubjectX500Principal().getName(X500Principal.RFC2253));
-    } catch (InvalidNameException e) {
-      return false;
-    }
-    String CN = null;
-    for (Rdn rdn : DN.getRdns()) {
-      if ("CN".equals(rdn.getType())) {
-        // Multiple AVAs are not treated
-        CN = (String) rdn.getValue();
-        break;
-      }
-    }
-    return verifyHostName(hostname, CN);
+    return PGjdbcHostnameVerifier.INSTANCE.verify(hostname, session);
   }
+
 }
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2004, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.ssl;
+
+import org.postgresql.util.GT;
+import org.postgresql.util.PSQLException;
+import org.postgresql.util.PSQLState;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.net.Socket;
+import java.security.AlgorithmParameters;
+import java.security.GeneralSecurityException;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Collection;
+
+import javax.crypto.Cipher;
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.net.ssl.X509KeyManager;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.x500.X500Principal;
+
+/**
+ * A Key manager that only loads the keys, if necessary.
+ */
+public class LazyKeyManager implements X509KeyManager {
+  private X509Certificate[] cert = null;
+  private PrivateKey key = null;
+  private String certfile;
+  private String keyfile;
+  private CallbackHandler cbh;
+  private boolean defaultfile;
+  private PSQLException error = null;
+
+  /**
+   * Constructor. certfile and keyfile can be null, in that case no certificate is presented to the
+   * server.
+   *
+   * @param certfile certfile
+   * @param keyfile key file
+   * @param cbh callback handler
+   * @param defaultfile default file
+   */
+  public LazyKeyManager(String certfile, String keyfile, CallbackHandler cbh, boolean defaultfile) {
+    this.certfile = certfile;
+    this.keyfile = keyfile;
+    this.cbh = cbh;
+    this.defaultfile = defaultfile;
+  }
+
+  /**
+   * getCertificateChain and getPrivateKey cannot throw exeptions, therefore any exception is stored
+   * in {@link #error} and can be raised by this method.
+   *
+   * @throws PSQLException if any exception is stored in {@link #error} and can be raised
+   */
+  public void throwKeyManagerException() throws PSQLException {
+    if (error != null) {
+      throw error;
+    }
+  }
+
+  @Override
+  public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
+    if (certfile == null) {
+      return null;
+    } else {
+      if (issuers == null || issuers.length == 0) {
+        // Postgres 8.4 and earlier do not send the list of accepted certificate authorities
+        // to the client. See BUG #5468. We only hope, that our certificate will be accepted.
+        return "user";
+      } else {
+        // Sending a wrong certificate makes the connection rejected, even, if clientcert=0 in
+        // pg_hba.conf.
+        // therefore we only send our certificate, if the issuer is listed in issuers
+        X509Certificate[] certchain = getCertificateChain("user");
+        if (certchain == null) {
+          return null;
+        } else {
+          X500Principal ourissuer = certchain[certchain.length - 1].getIssuerX500Principal();
+          boolean found = false;
+          for (Principal issuer : issuers) {
+            if (ourissuer.equals(issuer)) {
+              found = true;
+            }
+          }
+          return (found ? "user" : null);
+        }
+      }
+    }
+  }
+
+  @Override
+  public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
+    return null; // We are not a server
+  }
+
+  @Override
+  public X509Certificate[] getCertificateChain(String alias) {
+    if (cert == null && certfile != null) {
+      // If certfile is null, we do not load the certificate
+      // The certificate must be loaded
+      CertificateFactory cf;
+      try {
+        cf = CertificateFactory.getInstance("X.509");
+      } catch (CertificateException ex) {
+        // For some strange reason it throws CertificateException instead of
+        // NoSuchAlgorithmException...
+        error = new PSQLException(GT.tr(
+            "Could not find a java cryptographic algorithm: X.509 CertificateFactory not available."),
+            PSQLState.CONNECTION_FAILURE, ex);
+        return null;
+      }
+      Collection<? extends Certificate> certs;
+      try {
+        certs = cf.generateCertificates(new FileInputStream(certfile));
+      } catch (FileNotFoundException ioex) {
+        if (!defaultfile) { // It is not an error if there is no file at the default location
+          error = new PSQLException(
+              GT.tr("Could not open SSL certificate file {0}.", certfile),
+              PSQLState.CONNECTION_FAILURE, ioex);
+        }
+        return null;
+      } catch (CertificateException gsex) {
+        error = new PSQLException(GT.tr("Loading the SSL certificate {0} into a KeyManager failed.",
+            certfile), PSQLState.CONNECTION_FAILURE, gsex);
+        return null;
+      }
+      cert = certs.toArray(new X509Certificate[certs.size()]);
+    }
+    return cert;
+  }
+
+  @Override
+  public String[] getClientAliases(String keyType, Principal[] issuers) {
+    String alias = chooseClientAlias(new String[]{keyType}, issuers, (Socket) null);
+    return (alias == null ? new String[]{} : new String[]{alias});
+  }
+
+  @Override
+  public PrivateKey getPrivateKey(String alias) {
+    RandomAccessFile raf = null;
+    try {
+      if (key == null && keyfile != null) {
+        // If keyfile is null, we do not load the key
+        // The private key must be loaded
+        if (cert == null) { // We need the certificate for the algorithm
+          if (getCertificateChain("user") == null) {
+            return null; // getCertificateChain failed...
+          }
+        }
+
+        try {
+          raf = new RandomAccessFile(new File(keyfile), "r"); // NOSONAR
+        } catch (FileNotFoundException ex) {
+          if (!defaultfile) {
+            // It is not an error if there is no file at the default location
+            throw ex;
+          }
+          return null;
+        }
+        byte[] keydata = new byte[(int) raf.length()];
+        raf.readFully(keydata);
+        raf.close();
+        raf = null;
+
+        KeyFactory kf = KeyFactory.getInstance(cert[0].getPublicKey().getAlgorithm());
+        try {
+          KeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keydata);
+          key = kf.generatePrivate(pkcs8KeySpec);
+        } catch (InvalidKeySpecException ex) {
+          // The key might be password protected
+          EncryptedPrivateKeyInfo ePKInfo = new EncryptedPrivateKeyInfo(keydata);
+          Cipher cipher;
+          try {
+            cipher = Cipher.getInstance(ePKInfo.getAlgName());
+          } catch (NoSuchPaddingException npex) {
+            // Why is it not a subclass of NoSuchAlgorithmException?
+            throw new NoSuchAlgorithmException(npex.getMessage(), npex);
+          }
+          // We call back for the password
+          PasswordCallback pwdcb = new PasswordCallback(GT.tr("Enter SSL password: "), false);
+          try {
+            cbh.handle(new Callback[]{pwdcb});
+          } catch (UnsupportedCallbackException ucex) {
+            if ((cbh instanceof LibPQFactory.ConsoleCallbackHandler)
+                && ("Console is not available".equals(ucex.getMessage()))) {
+              error = new PSQLException(GT
+                  .tr("Could not read password for SSL key file, console is not available."),
+                  PSQLState.CONNECTION_FAILURE, ucex);
+            } else {
+              error =
+                  new PSQLException(
+                      GT.tr("Could not read password for SSL key file by callbackhandler {0}.",
+                              cbh.getClass().getName()),
+                      PSQLState.CONNECTION_FAILURE, ucex);
+            }
+            return null;
+          }
+          try {
+            PBEKeySpec pbeKeySpec = new PBEKeySpec(pwdcb.getPassword());
+            pwdcb.clearPassword();
+            // Now create the Key from the PBEKeySpec
+            SecretKeyFactory skFac = SecretKeyFactory.getInstance(ePKInfo.getAlgName());
+            Key pbeKey = skFac.generateSecret(pbeKeySpec);
+            // Extract the iteration count and the salt
+            AlgorithmParameters algParams = ePKInfo.getAlgParameters();
+            cipher.init(Cipher.DECRYPT_MODE, pbeKey, algParams);
+            // Decrypt the encryped private key into a PKCS8EncodedKeySpec
+            KeySpec pkcs8KeySpec = ePKInfo.getKeySpec(cipher);
+            key = kf.generatePrivate(pkcs8KeySpec);
+          } catch (GeneralSecurityException ikex) {
+            error = new PSQLException(
+                GT.tr("Could not decrypt SSL key file {0}.", keyfile),
+                PSQLState.CONNECTION_FAILURE, ikex);
+            return null;
+          }
+        }
+      }
+    } catch (IOException ioex) {
+      if (raf != null) {
+        try {
+          raf.close();
+        } catch (IOException ex) {
+        }
+      }
+
+      error = new PSQLException(GT.tr("Could not read SSL key file {0}.", keyfile),
+          PSQLState.CONNECTION_FAILURE, ioex);
+    } catch (NoSuchAlgorithmException ex) {
+      error = new PSQLException(GT.tr("Could not find a java cryptographic algorithm: {0}.",
+              ex.getMessage()), PSQLState.CONNECTION_FAILURE, ex);
+      return null;
+    }
+
+    return key;
+  }
+
+  @Override
+  public String[] getServerAliases(String keyType, Principal[] issuers) {
+    return new String[]{};
+  }
+}
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/LibPQFactory.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/LibPQFactory.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/LibPQFactory.java	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/LibPQFactory.java	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2004, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.ssl;
+
+import org.postgresql.PGProperty;
+import org.postgresql.jdbc.SslMode;
+import org.postgresql.ssl.NonValidatingFactory.NonValidatingTM;
+import org.postgresql.util.GT;
+import org.postgresql.util.ObjectFactory;
+import org.postgresql.util.PSQLException;
+import org.postgresql.util.PSQLState;
+
+import java.io.Console;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.util.Properties;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+/**
+ * Provide an SSLSocketFactory that is compatible with the libpq behaviour.
+ */
+public class LibPQFactory extends WrappedFactory {
+
+  LazyKeyManager km;
+
+  /**
+   * @param info the connection parameters The following parameters are used:
+   *        sslmode,sslcert,sslkey,sslrootcert,sslhostnameverifier,sslpasswordcallback,sslpassword
+   * @throws PSQLException if security error appears when initializing factory
+   */
+  public LibPQFactory(Properties info) throws PSQLException {
+    try {
+      SSLContext ctx = SSLContext.getInstance("TLS"); // or "SSL" ?
+
+      // Determining the default file location
+      String pathsep = System.getProperty("file.separator");
+      String defaultdir;
+      boolean defaultfile = false;
+      if (System.getProperty("os.name").toLowerCase().contains("windows")) { // It is Windows
+        defaultdir = System.getenv("APPDATA") + pathsep + "postgresql" + pathsep;
+      } else {
+        defaultdir = System.getProperty("user.home") + pathsep + ".postgresql" + pathsep;
+      }
+
+      // Load the client's certificate and key
+      String sslcertfile = PGProperty.SSL_CERT.get(info);
+      if (sslcertfile == null) { // Fall back to default
+        defaultfile = true;
+        sslcertfile = defaultdir + "postgresql.crt";
+      }
+      String sslkeyfile = PGProperty.SSL_KEY.get(info);
+      if (sslkeyfile == null) { // Fall back to default
+        defaultfile = true;
+        sslkeyfile = defaultdir + "postgresql.pk8";
+      }
+
+      // Determine the callback handler
+      CallbackHandler cbh;
+      String sslpasswordcallback = PGProperty.SSL_PASSWORD_CALLBACK.get(info);
+      if (sslpasswordcallback != null) {
+        try {
+          cbh = (CallbackHandler) ObjectFactory.instantiate(sslpasswordcallback, info, false, null);
+        } catch (Exception e) {
+          throw new PSQLException(
+              GT.tr("The password callback class provided {0} could not be instantiated.",
+                  sslpasswordcallback),
+              PSQLState.CONNECTION_FAILURE, e);
+        }
+      } else {
+        cbh = new ConsoleCallbackHandler(PGProperty.SSL_PASSWORD.get(info));
+      }
+
+      // If the properties are empty, give null to prevent client key selection
+      km = new LazyKeyManager(("".equals(sslcertfile) ? null : sslcertfile),
+          ("".equals(sslkeyfile) ? null : sslkeyfile), cbh, defaultfile);
+
+      TrustManager[] tm;
+      SslMode sslMode = SslMode.of(info);
+      if (!sslMode.verifyCertificate()) {
+        // server validation is not required
+        tm = new TrustManager[]{new NonValidatingTM()};
+      } else {
+        // Load the server certificate
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+        KeyStore ks;
+        try {
+          ks = KeyStore.getInstance("jks");
+        } catch (KeyStoreException e) {
+          // this should never happen
+          throw new NoSuchAlgorithmException("jks KeyStore not available");
+        }
+        String sslrootcertfile = PGProperty.SSL_ROOT_CERT.get(info);
+        if (sslrootcertfile == null) { // Fall back to default
+          sslrootcertfile = defaultdir + "root.crt";
+        }
+        FileInputStream fis;
+        try {
+          fis = new FileInputStream(sslrootcertfile); // NOSONAR
+        } catch (FileNotFoundException ex) {
+          throw new PSQLException(
+              GT.tr("Could not open SSL root certificate file {0}.", sslrootcertfile),
+              PSQLState.CONNECTION_FAILURE, ex);
+        }
+        try {
+          CertificateFactory cf = CertificateFactory.getInstance("X.509");
+          // Certificate[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{}); //Does
+          // not work in java 1.4
+          Object[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{});
+          ks.load(null, null);
+          for (int i = 0; i < certs.length; i++) {
+            ks.setCertificateEntry("cert" + i, (Certificate) certs[i]);
+          }
+          tmf.init(ks);
+        } catch (IOException ioex) {
+          throw new PSQLException(
+              GT.tr("Could not read SSL root certificate file {0}.", sslrootcertfile),
+              PSQLState.CONNECTION_FAILURE, ioex);
+        } catch (GeneralSecurityException gsex) {
+          throw new PSQLException(
+              GT.tr("Loading the SSL root certificate {0} into a TrustManager failed.",
+                      sslrootcertfile),
+              PSQLState.CONNECTION_FAILURE, gsex);
+        } finally {
+          try {
+            fis.close();
+          } catch (IOException e) {
+            /* ignore */
+          }
+        }
+        tm = tmf.getTrustManagers();
+      }
+
+      // finally we can initialize the context
+      try {
+        ctx.init(new KeyManager[]{km}, tm, null);
+      } catch (KeyManagementException ex) {
+        throw new PSQLException(GT.tr("Could not initialize SSL context."),
+            PSQLState.CONNECTION_FAILURE, ex);
+      }
+
+      _factory = ctx.getSocketFactory();
+    } catch (NoSuchAlgorithmException ex) {
+      throw new PSQLException(GT.tr("Could not find a java cryptographic algorithm: {0}.",
+              ex.getMessage()), PSQLState.CONNECTION_FAILURE, ex);
+    }
+  }
+
+  /**
+   * Propagates any exception from {@link LazyKeyManager}.
+   *
+   * @throws PSQLException if there is an exception to propagate
+   */
+  public void throwKeyManagerException() throws PSQLException {
+    if (km != null) {
+      km.throwKeyManagerException();
+    }
+  }
+
+  /**
+   * A CallbackHandler that reads the password from the console or returns the password given to its
+   * constructor.
+   */
+  static class ConsoleCallbackHandler implements CallbackHandler {
+
+    private char[] password = null;
+
+    ConsoleCallbackHandler(String password) {
+      if (password != null) {
+        this.password = password.toCharArray();
+      }
+    }
+
+    /**
+     * Handles the callbacks.
+     *
+     * @param callbacks The callbacks to handle
+     * @throws UnsupportedCallbackException If the console is not available or other than
+     *         PasswordCallback is supplied
+     */
+    @Override
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+      Console cons = System.console();
+      if (cons == null && password == null) {
+        throw new UnsupportedCallbackException(callbacks[0], "Console is not available");
+      }
+      for (Callback callback : callbacks) {
+        if (!(callback instanceof PasswordCallback)) {
+          throw new UnsupportedCallbackException(callback);
+        }
+        PasswordCallback pwdCallback = (PasswordCallback) callback;
+        if (password != null) {
+          pwdCallback.setPassword(password);
+          continue;
+        }
+        // It is used instead of cons.readPassword(prompt), because the prompt may contain '%'
+        // characters
+        pwdCallback.setPassword(cons.readPassword("%s", pwdCallback.getPrompt()));
+      }
+    }
+  }
+}
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java	2018-08-27 15:38:30.000000000 +0000
@@ -7,7 +7,8 @@
 
 import org.postgresql.PGProperty;
 import org.postgresql.core.PGStream;
-import org.postgresql.ssl.jdbc4.LibPQFactory;
+import org.postgresql.core.SocketFactoryFactory;
+import org.postgresql.jdbc.SslMode;
 import org.postgresql.util.GT;
 import org.postgresql.util.ObjectFactory;
 import org.postgresql.util.PSQLException;
@@ -17,7 +18,6 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
@@ -30,47 +30,38 @@
       throws PSQLException, IOException {
     LOGGER.log(Level.FINE, "converting regular socket connection to ssl");
 
-    SSLSocketFactory factory;
-
-    String sslmode = PGProperty.SSL_MODE.get(info);
-    // Use the default factory if no specific factory is requested
-    // unless sslmode is set
-    String classname = PGProperty.SSL_FACTORY.get(info);
-    if (classname == null) {
-      // If sslmode is set, use the libpq compatible factory
-      if (sslmode != null) {
-        factory = new LibPQFactory(info);
-      } else {
-        factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
-      }
-    } else {
-      try {
-        factory = (SSLSocketFactory) instantiate(classname, info, true,
-            PGProperty.SSL_FACTORY_ARG.get(info));
-      } catch (Exception e) {
-        throw new PSQLException(
-            GT.tr("The SSLSocketFactory class provided {0} could not be instantiated.", classname),
-            PSQLState.CONNECTION_FAILURE, e);
-      }
-    }
-
+    SSLSocketFactory factory = SocketFactoryFactory.getSslSocketFactory(info);
     SSLSocket newConnection;
     try {
       newConnection = (SSLSocket) factory.createSocket(stream.getSocket(),
           stream.getHostSpec().getHost(), stream.getHostSpec().getPort(), true);
       // We must invoke manually, otherwise the exceptions are hidden
+      newConnection.setUseClientMode(true);
       newConnection.startHandshake();
     } catch (IOException ex) {
-      if (factory instanceof LibPQFactory) { // throw any KeyManager exception
-        ((LibPQFactory) factory).throwKeyManagerException();
-      }
       throw new PSQLException(GT.tr("SSL error: {0}", ex.getMessage()),
           PSQLState.CONNECTION_FAILURE, ex);
     }
+    if (factory instanceof LibPQFactory) { // throw any KeyManager exception
+      ((LibPQFactory) factory).throwKeyManagerException();
+    }
 
+    SslMode sslMode = SslMode.of(info);
+    if (sslMode.verifyPeerName()) {
+      verifyPeerName(stream, info, newConnection);
+    }
+
+    stream.changeSocket(newConnection);
+  }
+
+  private static void verifyPeerName(PGStream stream, Properties info, SSLSocket newConnection)
+      throws PSQLException {
+    HostnameVerifier hvn;
     String sslhostnameverifier = PGProperty.SSL_HOSTNAME_VERIFIER.get(info);
-    if (sslhostnameverifier != null) {
-      HostnameVerifier hvn;
+    if (sslhostnameverifier == null) {
+      hvn = PGjdbcHostnameVerifier.INSTANCE;
+      sslhostnameverifier = "PgjdbcHostnameVerifier";
+    } else {
       try {
         hvn = (HostnameVerifier) instantiate(sslhostnameverifier, info, false, null);
       } catch (Exception e) {
@@ -79,24 +70,16 @@
                 sslhostnameverifier),
             PSQLState.CONNECTION_FAILURE, e);
       }
-      if (!hvn.verify(stream.getHostSpec().getHost(), newConnection.getSession())) {
-        throw new PSQLException(
-            GT.tr("The hostname {0} could not be verified by hostnameverifier {1}.",
-                stream.getHostSpec().getHost(), sslhostnameverifier),
-            PSQLState.CONNECTION_FAILURE);
-      }
-    } else {
-      if ("verify-full".equals(sslmode) && factory instanceof LibPQFactory) {
-        if (!(((LibPQFactory) factory).verify(stream.getHostSpec().getHost(),
-            newConnection.getSession()))) {
-          throw new PSQLException(
-              GT.tr("The hostname {0} could not be verified.", stream.getHostSpec().getHost()),
-              PSQLState.CONNECTION_FAILURE);
-        }
-      }
+    }
 
+    if (hvn.verify(stream.getHostSpec().getHost(), newConnection.getSession())) {
+      return;
     }
-    stream.changeSocket(newConnection);
+
+    throw new PSQLException(
+        GT.tr("The hostname {0} could not be verified by hostnameverifier {1}.",
+            stream.getHostSpec().getHost(), sslhostnameverifier),
+        PSQLState.CONNECTION_FAILURE);
   }
 
 }
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/PGjdbcHostnameVerifier.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/PGjdbcHostnameVerifier.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/ssl/PGjdbcHostnameVerifier.java	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/ssl/PGjdbcHostnameVerifier.java	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2018, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.ssl;
+
+import org.postgresql.util.GT;
+
+import java.net.IDN;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.security.auth.x500.X500Principal;
+
+public class PGjdbcHostnameVerifier implements HostnameVerifier {
+  private static final Logger LOGGER = Logger.getLogger(PGjdbcHostnameVerifier.class.getName());
+
+  public static final PGjdbcHostnameVerifier INSTANCE = new PGjdbcHostnameVerifier();
+
+  private static final int TYPE_DNS_NAME = 2;
+  private static final int TYPE_IP_ADDRESS = 7;
+
+  public static Comparator<String> HOSTNAME_PATTERN_COMPARATOR = new Comparator<String>() {
+    private int countChars(String value, char ch) {
+      int count = 0;
+      int pos = -1;
+      while (true) {
+        pos = value.indexOf(ch, pos + 1);
+        if (pos == -1) {
+          break;
+        }
+        count++;
+      }
+      return count;
+    }
+
+    @Override
+    public int compare(String o1, String o2) {
+      // The more the dots the better: a.b.c.postgresql.org is more specific than postgresql.org
+      int d1 = countChars(o1, '.');
+      int d2 = countChars(o2, '.');
+      if (d1 != d2) {
+        return d1 > d2 ? 1 : -1;
+      }
+
+      // The less the stars the better: postgresql.org is more specific than *.*.postgresql.org
+      int s1 = countChars(o1, '*');
+      int s2 = countChars(o2, '*');
+      if (s1 != s2) {
+        return s1 < s2 ? 1 : -1;
+      }
+
+      // The longer the better: postgresql.org is more specific than sql.org
+      int l1 = o1.length();
+      int l2 = o2.length();
+      if (l1 != l2) {
+        return l1 > l2 ? 1 : -1;
+      }
+
+      return 0;
+    }
+  };
+
+  @Override
+  public boolean verify(String hostname, SSLSession session) {
+    X509Certificate[] peerCerts;
+    try {
+      peerCerts = (X509Certificate[]) session.getPeerCertificates();
+    } catch (SSLPeerUnverifiedException e) {
+      LOGGER.log(Level.SEVERE,
+          GT.tr("Unable to parse X509Certificate for hostname {0}", hostname), e);
+      return false;
+    }
+    if (peerCerts == null || peerCerts.length == 0) {
+      LOGGER.log(Level.SEVERE,
+          GT.tr("No certificates found for hostname {0}", hostname));
+      return false;
+    }
+
+    String canonicalHostname;
+    if (hostname.startsWith("[") && hostname.endsWith("]")) {
+      // IPv6 address like [2001:db8:0:1:1:1:1:1]
+      canonicalHostname = hostname.substring(1, hostname.length() - 1);
+    } else {
+      // This converts unicode domain name to ASCII
+      try {
+        canonicalHostname = IDN.toASCII(hostname);
+        if (LOGGER.isLoggable(Level.FINEST)) {
+          LOGGER.log(Level.FINEST, "Canonical host name for {0} is {1}",
+              new Object[]{hostname, canonicalHostname});
+        }
+      } catch (IllegalArgumentException e) {
+        // e.g. hostname is invalid
+        LOGGER.log(Level.SEVERE,
+            GT.tr("Hostname {0} is invalid", hostname), e);
+        return false;
+      }
+    }
+
+    X509Certificate serverCert = peerCerts[0];
+
+    // Check for Subject Alternative Names (see RFC 6125)
+
+    Collection<List<?>> subjectAltNames;
+    try {
+      subjectAltNames = serverCert.getSubjectAlternativeNames();
+      if (subjectAltNames == null) {
+        subjectAltNames = Collections.emptyList();
+      }
+    } catch (CertificateParsingException e) {
+      LOGGER.log(Level.SEVERE,
+          GT.tr("Unable to parse certificates for hostname {0}", hostname), e);
+      return false;
+    }
+
+    boolean anyDnsSan = false;
+    /*
+     * Each item in the SAN collection is a 2-element list.
+     * See {@link X509Certificate#getSubjectAlternativeNames}
+     * The first element in each list is a number indicating the type of entry.
+     */
+    for (List<?> sanItem : subjectAltNames) {
+      if (sanItem.size() != 2) {
+        continue;
+      }
+      Integer sanType = (Integer) sanItem.get(0);
+      if (sanType == null) {
+        // just in case
+        continue;
+      }
+      if (sanType != TYPE_IP_ADDRESS && sanType != TYPE_DNS_NAME) {
+        continue;
+      }
+      String san = (String) sanItem.get(1);
+      if (sanType == TYPE_IP_ADDRESS && san.startsWith("*")) {
+        // Wildcards should not be present in the IP Address field
+        continue;
+      }
+      anyDnsSan |= sanType == TYPE_DNS_NAME;
+      if (verifyHostName(canonicalHostname, san)) {
+        if (LOGGER.isLoggable(Level.FINEST)) {
+          LOGGER.log(Level.SEVERE,
+              GT.tr("Server name validation pass for {0}, subjectAltName {1}", hostname, san));
+        }
+        return true;
+      }
+    }
+
+    if (anyDnsSan) {
+      /*
+       * RFC2818, section 3.1 (I bet you won't recheck :)
+       * If a subjectAltName extension of type dNSName is present, that MUST
+       * be used as the identity. Otherwise, the (most specific) Common Name
+       * field in the Subject field of the certificate MUST be used. Although
+       * the use of the Common Name is existing practice, it is deprecated and
+       * Certification Authorities are encouraged to use the dNSName instead.
+       */
+      LOGGER.log(Level.SEVERE,
+          GT.tr("Server name validation failed: certificate for host {0} dNSName entries subjectAltName,"
+              + " but none of them match. Assuming server name validation failed", hostname));
+      return false;
+    }
+
+    // Last attempt: no DNS Subject Alternative Name entries detected, try common name
+    LdapName DN;
+    try {
+      DN = new LdapName(serverCert.getSubjectX500Principal().getName(X500Principal.RFC2253));
+    } catch (InvalidNameException e) {
+      LOGGER.log(Level.SEVERE,
+          GT.tr("Server name validation failed: unable to extract common name"
+              + " from X509Certificate for hostname {0}", hostname), e);
+      return false;
+    }
+
+    List<String> commonNames = new ArrayList<String>(1);
+    for (Rdn rdn : DN.getRdns()) {
+      if ("CN".equals(rdn.getType())) {
+        commonNames.add((String) rdn.getValue());
+      }
+    }
+    if (commonNames.isEmpty()) {
+      LOGGER.log(Level.SEVERE,
+          GT.tr("Server name validation failed: certificate for hostname {0} has no DNS subjectAltNames,"
+                  + " and it CommonName is missing as well",
+              hostname));
+      return false;
+    }
+    if (commonNames.size() > 1) {
+      /*
+       * RFC2818, section 3.1
+       * If a subjectAltName extension of type dNSName is present, that MUST
+       * be used as the identity. Otherwise, the (most specific) Common Name
+       * field in the Subject field of the certificate MUST be used
+       *
+       * The sort is from less specific to most specific.
+       */
+      Collections.sort(commonNames, HOSTNAME_PATTERN_COMPARATOR);
+    }
+    String commonName = commonNames.get(commonNames.size() - 1);
+    boolean result = verifyHostName(canonicalHostname, commonName);
+    if (!result) {
+      LOGGER.log(Level.SEVERE,
+          GT.tr("Server name validation failed: hostname {0} does not match common name {1}",
+              hostname, commonName));
+    }
+    return result;
+  }
+
+  public boolean verifyHostName(String hostname, String pattern) {
+    if (hostname == null || pattern == null) {
+      return false;
+    }
+    int lastStar = pattern.lastIndexOf('*');
+    if (lastStar == -1) {
+      // No wildcard => just compare hostnames
+      return hostname.equalsIgnoreCase(pattern);
+    }
+    if (lastStar > 0) {
+      // Wildcards like foo*.com are not supported yet
+      return false;
+    }
+    if (pattern.indexOf('.') == -1) {
+      // Wildcard certificates should contain at least one dot
+      return false;
+    }
+    // pattern starts with *, so hostname should be at least (pattern.length-1) long
+    if (hostname.length() < pattern.length() - 1) {
+      return false;
+    }
+    // Use case insensitive comparison
+    final boolean ignoreCase = true;
+    // Below code is "hostname.endsWithIgnoreCase(pattern.withoutFirstStar())"
+
+    // E.g. hostname==sub.host.com; pattern==*.host.com
+    // We need to start the offset of ".host.com" in hostname
+    // For this we take hostname.length() - pattern.length()
+    // and +1 is required since pattern is known to start with *
+    int toffset = hostname.length() - pattern.length() + 1;
+
+    // Wildcard covers just one domain level
+    // a.b.c.com should not be covered by *.c.com
+    if (hostname.lastIndexOf('.', toffset - 1) >= 0) {
+      // If there's a dot in between 0..toffset
+      return false;
+    }
+
+    return hostname.regionMatches(ignoreCase, toffset,
+        pattern, 1, pattern.length() - 1);
+  }
+
+}
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/bg.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/bg.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/bg.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/bg.po	2018-08-27 15:38:30.000000000 +0000
@@ -6,7 +6,6 @@
 msgstr ""
 "Project-Id-Version: JDBC Driver for PostgreSQL 8.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2009-12-28 00:01+0100\n"
 "Last-Translator: <usun0v@mail.bg>\n"
 "Language-Team: <bg@li.org>\n"
@@ -17,17 +16,17 @@
 "X-Poedit-Language: Bulgarian\n"
 "X-Poedit-Country: BULGARIA\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 "Грешка при зареждане на настройките по подразбиране от файла driverconfig."
 "properties"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
@@ -37,42 +36,42 @@
 "трябва да предоставите java.net.SocketPermission права на сървъра и порта с "
 "базата данни, към който искате да се свържете."
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
 msgstr ""
 "Възникна неочаквана грешка с драйвъра. Моля докадвайте това изключение. "
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Времето за осъществяване на връзката изтече (таймаут)."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Опита за осъществяване на връзка бе своевременно прекъснат. "
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Методът {0} все още не е функционален."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, fuzzy, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr "Стойността на параметъра unknownLength трябва да бъде цяло число"
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr "Зададено CopyIn но получено {0}"
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr "Зададено CopyOut но получено {0}"
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, fuzzy, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr "Зададено CopyOut но получено {0}"
@@ -96,6 +95,12 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr "Няма пишещи права, за да копира байтова стойност {0}"
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+"Не може да осъществи актуализация на брояча при командно допълнение: {0}."
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -118,7 +123,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr "Очакван край на файла от сървъра, но получено: {0}"
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr "Непозволен синтаксис на функция или процедура при офсет {0}."
@@ -182,23 +187,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "Индексът на колоната е извън стойностен обхват: {0}, брой колони: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Невалидна дължина {0} на потока данни."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Невалидна дължина {0} на потока данни."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -207,39 +212,39 @@
 "Връзката отказана. Проверете дали името на хоста и порта са верни и дали "
 "postmaster приема ТСР / IP връзки."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Опита за връзка бе неуспешен."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Сървърът не поддържа SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Възникна грешка при осъществяване на SSL връзката."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr "Сървърът изисква идентифициране с парола, но парола не бе въведена."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -250,16 +255,16 @@
 "pg_hba.conf файла, да включва IP адреса на клиента или подмрежата, и че се "
 "използва схема за удостоверяване, поддържана от драйвъра."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Грешка в протокола. Неуспешна настройка на сесията."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -267,148 +272,148 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr "Очаквано командно допълнение COPY но получено: "
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr "Опит за получаване на заключване/резервация докато вече е получено"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 "Опит за премахване на заключването/резервацията при връзка към базата данни"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr ""
 "Прекъсване при чакане да получи заключване/резервация при връзка към базата "
 "данни"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr "Не може да подготви параметрите на командата."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Входно/изходна грешка при изпращане към backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Очаквана команда BEGIN, получена {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Неочакван статус на команда: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Входно/изходна грешка при изпращане към backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Неизвестен тип на отговор {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Входно/изходна грешка при изпращане към backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr "Неосъществена връзка към базата данни при започване на копирането"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr "Опит за прекъсване на неактивно копиране"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr "Неосъществена връзка към базата данни при прекъсване на копирането"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr "Липсва очакван отговор при грешка да прекъсне копирането"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 "Получени {0} отговори за грешка при единствено искане да се прекъсне "
 "копирането"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr "Опит за прекъсване на неактивно копиране"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr "Неосъществена връзка към базата данни при завършване на копирането"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr "Опит за писане при неактивна операция за копиране"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr "Неосъществена връзка към базата данни при опит за копиране"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr "Опит за четене при неактивно копиране"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr "Неосъществена връзка към базата данни при четене от копие"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr "Получено командно допълнение ''{0}'' без активна команда за копиране"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr "Получен CopyInResponse отговор от сървъра при активно {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr "Получен CopyOutResponse отговор от сървъра при активно {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, fuzzy, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr "Получен CopyOutResponse отговор от сървъра при активно {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr "Получено CopyData без наличие на активна операция за копиране"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Неочаквано CopyData от сървъра за {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr "Неочакван тип пакет при копиране: {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
@@ -417,21 +422,15 @@
 "Прекалено голяма дължина {0} на съобщението. Това може да е причинено от "
 "прекалено голяма или неправилно зададена дължина на InputStream параметри."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr "Недостатъчна памет при представяна на резултатите от заявката."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "За момента драйвъра не поддържа COPY команди."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-"Не може да осъществи актуализация на брояча при командно допълнение: {0}."
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -440,7 +439,7 @@
 "Параметърът client_encoding при сървъра бе променен на {0}. JDBC драйвъра "
 "изисква client_encoding да бъде UNICODE за да функционира правилно."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -449,7 +448,7 @@
 "Параметърът DateStyle при сървъра бе променен на {0}. JDBC драйвъра изисква "
 "DateStyle започва с ISO за да функционира правилно."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -512,36 +511,36 @@
 msgid "Unsupported property name: {0}"
 msgstr "Неподдържана стойност за тип: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr "Извикване на {0} - няма резултати и а бе очаквано цяло число."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr "Извикване на {0} - няма резултати и а бе очаквано цяло число."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr "Извикване на {0} - няма резултати и а бе очаквано цяло число."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr "Извикване на {0} - няма резултати и а бе очаквано цяло число."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr "Извикване на {0} - няма резултати и а бе очаквано цяло число."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "Функцията {0} е неизвестна."
@@ -609,63 +608,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "Функцията {0} може да приеме четири и само четири аргумента."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "Функцията {0} може да приеме два и само два аргумента."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "Функцията {0} може да приеме само един единствен аргумент."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "Функцията {0} може да приеме два или три аргумента."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "Функцията {0} не може да приема аргументи."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "Функцията {0} може да приеме три и само три аргумента."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Интервалът {0} не е валиден все още."
@@ -684,17 +690,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Не може да определи името на неупомената savepoint."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Индексът на масив е извън обхвата: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "Индексът на масив е извън обхвата: {0}, брой елементи: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -709,17 +715,17 @@
 "създаване на базата данни. Чест пример за това е съхраняване на 8bit данни в "
 "SQL_ASCII бази данни."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "CallableStatement функция бе обработена, но няма резултати."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 "CallableStatement функция бе обработена, но с непозволен брой параметри."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -728,7 +734,7 @@
 "CallableStatement функция бе обработена и изходния параметър {0} бе от тип "
 "{1}, обаче тип {2} бе използван."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
@@ -736,12 +742,12 @@
 "Тази заявка не декларира изходен параметър. Ползвайте '{' ?= call ... '}' за "
 "да декларирате такъв."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr "wasNull не може да бьде изпълнен, преди наличието на резултата."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -749,7 +755,7 @@
 msgstr ""
 "Отчетен параметър от тип {0}, но обработено като get{1} (sqltype={2}). "
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -757,29 +763,29 @@
 "CallableStatement функция бе декларирана, но обработена като "
 "registerOutParameter(1, <some type>) "
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr "Резултати от функцията не бяха регистрирани."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 "Резултати от CallableStatement функция не могат да бъдат получени, преди тя "
 "да бъде обработена."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Неподдържана стойност за тип: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Непозволена стойност за StringType параметър: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -791,131 +797,131 @@
 msgid "No results were returned by the query."
 msgstr "Няма намерени резултати за заявката."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Бе получен резултат, когато такъв не бе очакван."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr "Специфични типови съответствия не се поддържат."
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Неуспешно създаване на обект за: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr "Невъзможно е зареждането на клас {0}, отговарящ за типа данни {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 "Не може да променяте правата на транзакцията по време на нейното извършване."
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Връзката бе прекъсната."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 "Не може да променяте изолационното ниво на транзакцията по време на нейното "
 "извършване."
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Изолационно ниво на транзакциите {0} не се поддържа."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Приключване на връзка, която не бе прекъсната:"
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Невъзможно преобразуване на данни в желаното кодиране."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Размера за fetch size трябва да бъде по-голям или равен на 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr "Не може да се намери типа на сървърен масив за зададеното име {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Невалидни флагове {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Невалидна дължина {0} на потока данни."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Неуспешно създаване на обект за: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr "Информацията за ClientInfo не се поддържа."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr ""
 "Времето за изпълнение на заявката трябва да бъде стойност по-голяма или "
 "равна на 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "Неизвестна ResultSet holdability настройка: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "Не може да се установи savepoint в auto-commit модус."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "Автоматично генерирани ключове не се поддържат."
 
@@ -931,47 +937,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "Не може да се намери името на типа данни в системните каталози."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "Не може да се намери името на типа данни в системните каталози."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -980,68 +986,68 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "Параметърният индекс е извън обхват: {0}, брой параметри: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 "Не може да се употребяват методи за заявка, които ползват низове на "
 "PreparedStatement."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Стойност от неизвестен тип."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Невалидна дължина {0} на потока данни."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "JVM не поддържа за момента {0} кодовата таблица."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "Зададения InputStream поток е неуспешен."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Неизвестен тип {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "Не може да преобразува инстанция на {0} към тип {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Неподдържана стойност за тип: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "Не може да преобразува инстанцията на {0} във вида {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
@@ -1050,17 +1056,17 @@
 "Не може да се определи SQL тип, който да се използва за инстанцията на {0}. "
 "Ползвайте метода setObject() с точни стойности, за да определите типа."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "Неочаквана грешка при записване на голям обект LOB в базата данни."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Грешка с ползвания четец."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1078,8 +1084,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "Не може да преобразува инстанцията на {0} във вида {1}"
@@ -1093,7 +1099,7 @@
 "при редицата на въвеждане."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "Невалидна константа за fetch посоката: {0}."
@@ -1140,8 +1146,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "JVM не поддържа тази кодова таблица за момента: {0}"
@@ -1157,7 +1163,7 @@
 "въвеждане."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1177,27 +1183,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "Невалидна стойност за тип {0} : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Името на колоната {0} не бе намерено в този ResultSet."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1207,43 +1213,43 @@
 "да селектира само една таблица, както и всички първични ключове в нея. За "
 "повече информация, вижте раздел 5.6 на JDBC 2.1 API Specification."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "Операциите по този ResultSet са били прекратени."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 "ResultSet не е референциран правилно. Вероятно трябва да придвижите курсора "
 "посредством next."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr "Невалидни UUID данни."
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Изолационно ниво на транзакциите {0} не се поддържа."
@@ -1311,38 +1317,38 @@
 msgstr ""
 "Максималният брой редове трябва да бъде стойност по-голяма или равна на 0."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr ""
 "Времето за изпълнение на заявката трябва да бъде стойност по-голяма или "
 "равна на 0."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr ""
 "Максималният размер на полето трябва да бъде стойност по-голяма или равна на "
 "0."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Командата е извършена."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 "Автоматично генерирани ключове спрямо индекс на колона не се поддържат."
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "Невалидна стойност за тип {0} : {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Неподдържана стойност за тип: {0}"
@@ -1355,31 +1361,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Невалидна дължина {0} на потока данни."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Невалидна дължина {0} на потока данни."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Не може да инициализира LargeObject API"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "Големи обекти LOB не могат да се използват в auto-commit модус."
 
@@ -1413,34 +1419,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Възникна грешка при осъществяване на SSL връзката."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1575,31 +1581,31 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr "Невалидни флагове {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "xid не може да бъде null"
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr "Връзката е заета с друга транзакция"
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "спиране / започване не се поддържа за момента"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1608,11 +1614,11 @@
 "Транзакция в транзакция не се поддържа за момента. xid={0}, currentXid={1}, "
 "state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr "Грешка при изключване на autocommit"
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
@@ -1621,7 +1627,7 @@
 "опита да извика end без съответстващо извикване на start. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, fuzzy, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
@@ -1629,12 +1635,12 @@
 "Грешка при възстановяване на състоянието преди подготвена транзакция. "
 "rollback xid={0}, preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1644,21 +1650,21 @@
 "същата връзка, при която е започната транзакцията. currentXid={0}, prepare "
 "xid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr "Prepare извикано преди края. prepare xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Грешка при подготвяне на транзакция. prepare xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr "Грешка при възстановяване"
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
@@ -1667,13 +1673,13 @@
 "Грешка при възстановяване на състоянието преди подготвена транзакция. "
 "rollback xid={0}, preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
@@ -1681,22 +1687,22 @@
 "Невъзможна комбинация: едно-фазов commit трябва да бъде издаден чрез "
 "използване на същата връзка, при която е започнал"
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr "commit извикан преди end. commit xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "Грешка при едно-фазов commit. commit xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
@@ -1705,7 +1711,7 @@
 "издадена при свободна връзка. commit xid={0}, currentXid={1}, state={2], "
 "transactionState={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, fuzzy, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
@@ -1714,7 +1720,7 @@
 "Грешка при възстановяване на състоянието преди подготвена транзакция. commit "
 "xid={0}, preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr "Евристичен commit или rollback не се поддържа. forget xid={0}"
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/cs.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/cs.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/cs.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/cs.po	2018-08-27 15:38:30.000000000 +0000
@@ -7,7 +7,6 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL JDBC Driver 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2005-08-21 20:00+0200\n"
 "Last-Translator: Petr Dittrich <bodyn@medoro.org>\n"
 "Language-Team: \n"
@@ -16,59 +15,59 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr "Chyba na��t�n� standardn�ho nastaven� z driverconfig.properties"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
 msgstr ""
 "N�co neobvykl�ho p�inutilo ovlada� selhat. Pros�m nahlaste tuto vyj�mku."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 #, fuzzy
 msgid "Connection attempt timed out."
 msgstr "Pokus o p�ipojen� selhal."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 #, fuzzy
 msgid "Interrupted while attempting to connect."
 msgstr "Nastala chyba p�i nastaven� SSL spojen�."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Metoda {0} nen� implementov�na."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -93,6 +92,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -113,7 +117,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr ""
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr "Po�kozen� funkce nebo opu�t�n� procedury na pozici {0}."
@@ -169,23 +173,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "Index sloupece je mimo rozsah: {0}, po�et sloupc�: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -194,39 +198,39 @@
 "Spojen� odm�tnuto. Zkontrolujte zda je jm�no hosta a port spr�vn� a zda "
 "postmaster p�ij�m� TCP/IP spojen�."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Pokus o p�ipojen� selhal."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Server nepodporuje SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Nastala chyba p�i nastaven� SSL spojen�."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr "Server vy�aduje ov��en� heslem, ale ��dn� nebylo posl�no."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -237,16 +241,16 @@
 "pg_hba.conf obsahuje klientskou IP adresu �i pods�� a zda je pou�it� "
 "ov��enovac� sch�ma podporov�no ovlada�em."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Chyba protokolu. Nastaven� relace selhalo."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -254,177 +258,172 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 #, fuzzy
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Nastala chyba p�i nastaven� SSL spojen�."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Vystupn�/v�stupn� chyba p�i odes�l�n� k backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "O�ek�v�n p��kaz BEGIN, obdr�en {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Neo�ek�van� stav p��kazu: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Vystupn�/v�stupn� chyba p�i odes�l�n� k backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Nezn�m� typ odpov�di {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Vystupn�/v�stupn� chyba p�i odes�l�n� k backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Neo�ek�van� stav p��kazu: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Ovlada� nyn� nepodporuje p��kaz COPY."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
 "requires client_encoding to be UTF8 for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
 "requires DateStyle to begin with ISO for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -483,36 +482,36 @@
 msgid "Unsupported property name: {0}"
 msgstr "Nepodporovan� hodnota typu: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr "Obdr�en v�sledek, ikdy� ��dn� nebyl o�ek�v�n."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr ""
@@ -578,63 +577,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "Funkce {0} bere p�esn� �ty�i argumenty."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "Funkce {0} bere pr�v� dva argumenty."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "Funkce {0} bere jeden argument."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "Funkce {0} bere dva nebo t�i argumenty."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "Funkce {0} nebere ��dn� argument."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, fuzzy, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "Funkce {0} bere pr�v� dva argumenty."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, fuzzy, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Metoda {0} nen� implementov�na."
@@ -653,17 +659,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Nemohu z�skat n�zev nepojmenovan�ho savepointu."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Index pole mimo rozsah: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "Index pole mimo rozsah: {0}, po�et prvk�: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -678,68 +684,68 @@
 "zakl�d�n� datab�ze. Nejzn�mej�� p��klad je ukl�d�n� 8bitov�ch dat vSQL_ASCII "
 "datab�zi."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "CallableStatement byl spu�t�n, le� nic nebylo vr�ceno."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 #, fuzzy
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr "CallableStatement byl spu�t�n, le� nic nebylo vr�ceno."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
 "type {1} however type {2} was registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Nepodporovan� hodnota typu: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, fuzzy, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Nepodporovan� hodnota typu: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -751,128 +757,128 @@
 msgid "No results were returned by the query."
 msgstr "Neobdr�en ��dn� v�sledek dotazu."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Obdr�en v�sledek, ikdy� ��dn� nebyl o�ek�v�n."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Selhalo vytvo�en� objektu: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr "Nemohu na��st t��du {0} odpov�dnou za typ {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Spojeni bylo uzav�eno."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 #, fuzzy
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Spojeni bylo uzav�eno."
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Nemohu p�elo�it data do po�adovan�ho k�dov�n�."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Nabran� velikost mus� b�t nez�porn�."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Selhalo vytvo�en� objektu: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 #, fuzzy
 msgid "ClientInfo property not supported."
 msgstr "Vr�cen� automaticky generovan�ch kl��� nen� podporov�no."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "�asov� limit dotazu mus� b�t nez�porn� ��slo."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "Nemohu vytvo�it savepoint v auto-commit modu."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "Vr�cen� automaticky generovan�ch kl��� nen� podporov�no."
 
@@ -887,47 +893,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "Nemohu naj�t n�zev typu v syst�mov�m katalogu."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "Nemohu naj�t n�zev typu v syst�mov�m katalogu."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -936,83 +942,83 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "Index parametru mimo rozsah: {0}, po�et parametr� {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Nezn�m� hodnota typu."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "JVM tvrd�, �e nepodporuje kodov�n� {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "Selhal poskytnut� InputStream."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Nezn�m� typ {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "Nemohu p�etypovat instanci {0} na typ {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Nepodporovan� hodnota typu: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, fuzzy, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "Nemohu p�etypovat instanci {0} na typ {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "Neo�ek�van� chyba p�i zapisov�n� velk�ho objektu do datab�ze."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Selhal poskytnut� Reader."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1028,8 +1034,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "Nemohu p�etypovat instanci {0} na typ {1}"
@@ -1041,7 +1047,7 @@
 msgstr "Nem��ete pou��vat relativn� p�esuny p�i vkl�d�n� ��dku."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "�patn� sm�r �ten�: {0}."
@@ -1081,8 +1087,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "JVM tvrd�, �e nepodporuje kodov�n�: {0}"
@@ -1096,7 +1102,7 @@
 msgstr "Nemohu volat updateRow() na vlk�dan�m ��dku."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1113,27 +1119,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "�patn� hodnota pro typ {0} : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Sloupec pojmenovan� {0} nebyl nalezen v ResultSet."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1143,41 +1149,41 @@
 "mus� obsahovat v�echny prim�rn� kl��e tabulky. Koukni do JDBC 2.1 API "
 "Specifikace, sekce 5.6 pro v�ce podrobnost�."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "Tento ResultSet je uzav�en�."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr ""
@@ -1243,34 +1249,34 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "Maxim�ln� po�et ��dek mus� b�t nez�porn� ��slo."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "�asov� limit dotazu mus� b�t nez�porn� ��slo."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "Maxim�ln� velikost pole mus� b�t nez�porn� ��slo."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "P��kaz byl uzav�en."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 #, fuzzy
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr "Vr�cen� automaticky generovan�ch kl��� nen� podporov�no."
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "�patn� hodnota pro typ {0} : {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Nepodporovan� hodnota typu: {0}"
@@ -1283,31 +1289,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Selhala inicializace LargeObject API"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "Velk� objecky nemohou b�t pou�ity v auto-commit modu."
 
@@ -1341,34 +1347,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Nastala chyba p�i nastaven� SSL spojen�."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1504,128 +1510,128 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, fuzzy, java-format
 msgid "Invalid flags {0}"
 msgstr "Vadn� d�lka proudu {0}."
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/de.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/de.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/de.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/de.po	2018-08-27 15:38:30.000000000 +0000
@@ -8,7 +8,6 @@
 msgstr ""
 "Project-Id-Version: head-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2008-09-12 14:22+0200\n"
 "Last-Translator: Andre Bialojahn <ab.spamnews@freenet.de>\n"
 "Language-Team: Deutsch\n"
@@ -20,15 +19,15 @@
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr "Fehler beim Laden der Voreinstellungen aus driverconfig.properties"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
@@ -39,7 +38,7 @@
 "java.net.SocketPermission gew�hren, um den Rechner auf dem gew�hlten Port zu "
 "erreichen."
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -47,35 +46,35 @@
 "Etwas Ungew�hnliches ist passiert, das den Treiber fehlschlagen lie�. Bitte "
 "teilen Sie diesen Fehler mit."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Keine Verbindung innerhalb des Zeitintervalls m�glich."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Beim Verbindungsversuch trat eine Unterbrechung auf."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Die Methode {0} ist noch nicht implementiert."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -100,6 +99,13 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+"Der Updatecount aus der Kommandovervollst�ndigungsmarkierung(?) {0} konnte "
+"nicht interpretiert werden."
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -124,7 +130,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr "Vom Server wurde ein EOF erwartet, jedoch {0} gelesen."
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -188,25 +194,25 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr ""
 "Der Spaltenindex {0} ist au�erhalb des g�ltigen Bereichs. Anzahl Spalten: "
 "{1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Ung�ltige L�nge des Datenstroms: {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Ung�ltige L�nge des Datenstroms: {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -215,27 +221,27 @@
 "Verbindung verweigert. �berpr�fen Sie die Korrektheit von Hostnamen und der "
 "Portnummer und dass der Datenbankserver TCP/IP-Verbindungen annimmt."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Der Verbindungsversuch schlug fehl."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Der Server unterst�tzt SSL nicht."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Beim Aufbau der SSL-Verbindung trat ein Fehler auf."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
@@ -243,13 +249,13 @@
 "Der Server verlangt passwortbasierte Authentifizierung, jedoch wurde kein "
 "Passwort angegeben."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -261,16 +267,16 @@
 "enth�lt und dass der Client ein Authentifizierungsschema nutzt, das vom "
 "Treiber unterst�tzt wird."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Protokollfehler.  Die Sitzung konnte nicht gestartet werden."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -278,144 +284,144 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 #, fuzzy
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Beim Verbindungsversuch trat eine Unterbrechung auf."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr "Der Anweisung konnten keine Parameterwerte zugewiesen werden."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Eingabe/Ausgabe-Fehler {0} beim Senden an das Backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Statt des erwarteten Befehlsstatus BEGIN, wurde {0} empfangen."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Unerwarteter Befehlsstatus: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Eingabe/Ausgabe-Fehler {0} beim Senden an das Backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Die Antwort weist einen unbekannten Typ auf: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Eingabe/Ausgabe-Fehler {0} beim Senden an das Backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Vom Server wurde ein EOF erwartet, jedoch {0} gelesen."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
@@ -424,22 +430,15 @@
 "Die Nachrichtenl�nge {0} ist zu gro�. Das kann von sehr gro�en oder "
 "inkorrekten L�ngenangaben eines InputStream-Parameters herr�hren."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr "Nicht gen�gend Speicher beim Abholen der Abfrageergebnisse."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Der Treiber unterst�tzt derzeit keine COPY-Operationen."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-"Der Updatecount aus der Kommandovervollst�ndigungsmarkierung(?) {0} konnte "
-"nicht interpretiert werden."
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -449,7 +448,7 @@
 "Der JDBC-Treiber setzt f�r korrektes Funktionieren die Einstellung UNICODE "
 "voraus."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -459,7 +458,7 @@
 "JDBC-Treiber setzt f�r korrekte Funktion voraus, dass ''Date Style'' mit "
 "''ISO'' beginnt."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -525,21 +524,21 @@
 msgid "Unsupported property name: {0}"
 msgstr "Unbekannter Typ: {0}."
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 "Der Fastpath-Aufruf {0} gab kein Ergebnis zur�ck, jedoch wurde ein Integer "
 "erwartet."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 "Der Fastpath-Aufruf {0} gab kein Ergebnis zur�ck, jedoch wurde ein Integer "
 "erwartet."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -548,14 +547,14 @@
 "Der Fastpath-Aufruf {0} gab kein Ergebnis zur�ck, jedoch wurde ein Integer "
 "erwartet."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 "Der Fastpath-Aufruf {0} gab kein Ergebnis zur�ck, jedoch wurde ein Integer "
 "erwartet."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -564,7 +563,7 @@
 "Der Fastpath-Aufruf {0} gab kein Ergebnis zur�ck, jedoch wurde ein Integer "
 "erwartet."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "Die Fastpath-Funktion {0} ist unbekannt."
@@ -635,63 +634,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "Die {0}-Funktion erwartet genau vier Argumente."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "Die {0}-Funktion erwartet genau zwei Argumente."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "Die {0}-Funktion erwartet nur genau ein Argument."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "Die {0}-Funktion erwartet zwei oder drei Argumente."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "Die {0}-Funktion akzeptiert kein Argument."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "Die {0}-Funktion erwartet genau drei Argumente."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Intervall {0} ist noch nicht implementiert."
@@ -711,19 +717,19 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Der Name eines namenlosen Rettungpunktes kann nicht ermittelt werden."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Der Arrayindex ist au�erhalb des g�ltigen Bereichs: {0}."
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr ""
 "Der Arrayindex {0} ist au�erhalb des g�ltigen Bereichs. Vorhandene Elemente: "
 "{1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -738,17 +744,17 @@
 "vorliegen, als die, in der die Datenbank erstellt wurde.  Das h�ufigste "
 "Beispiel daf�r ist es, 8Bit-Daten in SQL_ASCII-Datenbanken abzulegen."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "Ein CallableStatement wurde ausgef�hrt ohne etwas zur�ckzugeben."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 "Ein CallableStatement wurde mit einer falschen Anzahl Parameter ausgef�hrt."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -757,7 +763,7 @@
 "Eine CallableStatement-Funktion wurde ausgef�hrt und der R�ckgabewert {0} "
 "war vom Typ {1}. Jedoch wurde der Typ {2} daf�r registriert."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
@@ -765,13 +771,13 @@
 "Diese Anweisung deklariert keinen OUT-Parameter. Benutzen Sie '{' ?= "
 "call ... '}' um das zu tun."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 "wasNull kann nicht aufgerufen werden, bevor ein Ergebnis abgefragt wurde."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -780,7 +786,7 @@
 "Ein Parameter des Typs {0} wurde registriert, jedoch erfolgte ein Aufruf "
 "get{1} (sqltype={2})."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -788,30 +794,30 @@
 "Ein CallableStatement wurde deklariert, aber kein Aufruf von "
 "''registerOutParameter(1, <some type>)'' erfolgte."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 #, fuzzy
 msgid "No function outputs were registered."
 msgstr "Es wurden keine Funktionsausgaben registriert."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 "Ergebnisse k�nnen nicht von einem CallableStatement abgerufen werden, bevor "
 "es ausgef�hrt wurde."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Unbekannter Typ: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Nichtunterst�tzter Wert f�r den Stringparameter: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -823,134 +829,134 @@
 msgid "No results were returned by the query."
 msgstr "Die Abfrage lieferte kein Ergebnis."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Die Anweisung lieferte ein Ergebnis obwohl keines erwartet wurde."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 #, fuzzy
 msgid "Custom type maps are not supported."
 msgstr "Selbstdefinierte Typabbildungen werden nicht unterst�tzt."
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Erstellung des Objektes schlug fehl f�r: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 "Die f�r den Datentyp {1} verantwortliche Klasse {0} konnte nicht geladen "
 "werden."
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 "Die Nur-Lesen-Eigenschaft einer Transaktion kann nicht w�hrend der "
 "Transaktion ver�ndert werden."
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Die Verbindung wurde geschlossen."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 "Die Transaktions-Trennungsstufe kann nicht w�hrend einer Transaktion "
 "ver�ndert werden."
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Die Transaktions-Trennungsstufe {0} ist nicht unterst�tzt."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Eine Connection wurde finalisiert, die nie geschlossen wurde:"
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Die Daten konnten nicht in die gew�nschte Kodierung gewandelt werden."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Die Fetch-Gr��e muss ein Wert gr��er oder gleich Null sein."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, fuzzy, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 "F�r den angegebenen Namen {0} konnte kein Serverarraytyp gefunden werden."
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Ung�ltige L�nge des Datenstroms: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Ung�ltige L�nge des Datenstroms: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Erstellung des Objektes schlug fehl f�r: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr "Die ClientInfo-Eigenschaft ist nicht unterst�tzt."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "Das Abfragetimeout muss ein Wert gr��er oder gleich Null sein."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "Unbekannte Einstellung f�r die Haltbarkeit des ResultSets: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "Ein Rettungspunkt kann im Modus ''auto-commit'' nicht erstellt werden."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "Die R�ckgabe automatisch generierter Schl�ssel wird nicht unterst�tzt,"
 
@@ -967,48 +973,48 @@
 msgstr ""
 "In den Systemkatalogen konnte der Namensdatentyp nicht gefunden werden."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr ""
 "In den Systemkatalogen konnte der Namensdatentyp nicht gefunden werden."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -1019,10 +1025,10 @@
 "Der Parameterindex {0} ist au�erhalb des g�ltigen Bereichs. Es gibt {1} "
 "Parameter."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 #, fuzzy
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
@@ -1030,58 +1036,58 @@
 "Abfragemethoden, die einen Abfragestring annehmen, k�nnen nicht auf ein "
 "PreparedStatement angewandt werden."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Unbekannter Typ."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Ung�ltige L�nge des Datenstroms: {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "Die JVM behauptet, die Zeichenkodierung {0} nicht zu unterst�tzen."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "Der bereitgestellte InputStream scheiterte."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Unbekannter Typ {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "Die Typwandlung f�r eine Instanz von {0} nach {1} ist nicht m�glich."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Unbekannter Typ: {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "Die Typwandlung f�r eine Instanz von {0} nach {1} ist nicht m�glich."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
@@ -1091,19 +1097,19 @@
 "abgeleitet werden. Benutzen Sie ''setObject()'' mit einem expliziten Typ, um "
 "ihn festzulegen."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr ""
 "Beim Schreiben eines LargeObjects (LOB) in die Datenbank trat ein "
 "unerwarteter Fehler auf."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Der bereitgestellte Reader scheiterte."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1121,8 +1127,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "Die Typwandlung f�r eine Instanz von {0} nach {1} ist nicht m�glich."
@@ -1135,7 +1141,7 @@
 "Relative Bewegungen k�nnen in der Einf�gezeile nicht durchgef�hrt werden."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "Unzul�ssige Richtungskonstante bei fetch: {0}."
@@ -1180,8 +1186,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "Die JVM behauptet, die Zeichenkodierung {0} nicht zu unterst�tzen."
@@ -1195,7 +1201,7 @@
 msgstr "''updateRow()'' kann in der Einf�gezeile nicht aufgerufen werden."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1216,27 +1222,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "Unzul�ssiger Wert f�r den Typ {0} : {1}."
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Der Spaltenname {0} wurde in diesem ResultSet nicht gefunden."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1246,44 +1252,44 @@
 "darf nur eine Tabelle und muss darin alle Prim�rschl�ssel ausw�hlen. Siehe "
 "JDBC 2.1 API-Spezifikation, Abschnitt 5.6 f�r mehr Details."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "Dieses ResultSet ist geschlossen."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 "Das ResultSet ist nicht richtig positioniert. Eventuell muss ''next'' "
 "aufgerufen werden."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 #, fuzzy
 msgid "Invalid UUID data."
 msgstr "Ung�ltiges Flag."
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Die Transaktions-Trennungsstufe {0} ist nicht unterst�tzt."
@@ -1349,34 +1355,34 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "Die maximale Zeilenzahl muss ein Wert gr��er oder gleich Null sein."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "Das Abfragetimeout muss ein Wert gr��er oder gleich Null sein."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "Die maximale Feldgr��e muss ein Wert gr��er oder gleich Null sein."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Die Anweisung wurde geschlossen."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 #, fuzzy
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr "Die R�ckgabe automatisch generierter Schl�ssel wird nicht unterst�tzt,"
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "Unzul�ssiger Wert f�r den Typ {0} : {1}."
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Unbekannter Typ: {0}."
@@ -1389,31 +1395,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Ung�ltige L�nge des Datenstroms: {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Ung�ltige L�nge des Datenstroms: {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Die LargeObject-API konnte nicht initialisiert werden."
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr ""
 "LargeObjects (LOB) d�rfen im Modus ''auto-commit'' nicht verwendet werden."
@@ -1452,34 +1458,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Beim Aufbau der SSL-Verbindung trat ein Fehler auf."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1616,42 +1622,42 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, fuzzy, java-format
 msgid "Invalid flags {0}"
 msgstr "Ung�ltige Flags"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "Die xid darf nicht null sein."
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr "Die Verbindung ist derzeit mit einer anderen Transaktion besch�ftigt."
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "Anhalten/Fortsetzen ist nicht implementiert."
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr "Fehler beim Abschalten von Autocommit."
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, fuzzy, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
@@ -1659,18 +1665,18 @@
 msgstr ""
 "Es wurde versucht, ohne dazugeh�rigen ''start''-Aufruf ''end'' aufzurufen."
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, fuzzy, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1679,34 +1685,34 @@
 "Nicht implementiert: ''Prepare'' muss �ber die selbe Verbindung abgesetzt "
 "werden, die die Transaktion startete."
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, fuzzy, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr "''Prepare'' wurde vor ''end'' aufgerufen."
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, fuzzy, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Beim Vorbereiten der Transaktion trat ein Fehler auf."
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr "Beim Wiederherstellen trat ein Fehler auf."
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, fuzzy, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr "Fehler beim Rollback einer vorbereiteten Transaktion."
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
@@ -1714,22 +1720,22 @@
 "Nicht implementiert: Die einphasige Best�tigung muss �ber die selbe "
 "Verbindung abgewickelt werden, die verwendet wurde, um sie zu beginnen."
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, fuzzy, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr "''Commit'' wurde vor ''end'' aufgerufen."
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, fuzzy, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "Bei der einphasigen Best�tigung trat ein Fehler auf."
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 #, fuzzy
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
@@ -1738,14 +1744,14 @@
 "Nicht implementiert: Die zweite Best�tigungsphase muss �ber eine im Leerlauf "
 "befindliche Verbindung abgewickelt werden."
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, fuzzy, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr "Fehler beim Rollback einer vorbereiteten Transaktion."
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, fuzzy, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr "Heuristisches Commit/Rollback wird nicht unterst�tzt."
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/es.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/es.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/es.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/es.po	2018-08-27 15:38:30.000000000 +0000
@@ -5,7 +5,6 @@
 msgstr ""
 "Project-Id-Version: JDBC PostgreSQL Driver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2004-10-22 16:51-0300\n"
 "Last-Translator: Diego Gil <diego@adminsa.com>\n"
 "Language-Team: \n"
@@ -15,22 +14,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Spanish\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -38,37 +37,37 @@
 "Algo inusual ha ocurrido que provocó un fallo en el controlador. Por favor "
 "reporte esta excepción."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 #, fuzzy
 msgid "Connection attempt timed out."
 msgstr "El intento de conexión falló."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 #, fuzzy
 msgid "Interrupted while attempting to connect."
 msgstr "Ha ocorrido un error mientras se establecía la conexión SSL."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, fuzzy, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Este método aún no ha sido implementado."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -92,6 +91,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, fuzzy, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -114,7 +118,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr ""
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -170,24 +174,24 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr ""
 "El índice de la columna está fuera de rango: {0}, número de columnas: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -196,27 +200,27 @@
 "Conexión rechazada. Verifique que el nombre del Host y el puerto sean "
 "correctos y que postmaster este aceptando conexiones TCP/IP."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "El intento de conexión falló."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Este servidor no soporta SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Ha ocorrido un error mientras se establecía la conexión SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
@@ -224,13 +228,13 @@
 "El servidor requiere autenticación basada en contraseña, pero no se ha "
 "provisto ninguna contraseña."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, fuzzy, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -242,16 +246,16 @@
 "subred, y que está usando un esquema de autenticación soportado por el "
 "driver."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Error de protocolo. Falló el inicio de la sesión."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -259,177 +263,172 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Un error de E/S ha ocurrido mientras se enviaba al backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Un error de E/S ha ocurrido mientras se enviaba al backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Tipo de respuesta desconocida {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Un error de E/S ha ocurrido mientras se enviaba al backend."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
 "requires client_encoding to be UTF8 for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
 "requires DateStyle to begin with ISO for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -490,36 +489,36 @@
 msgid "Unsupported property name: {0}"
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr "Se retornó un resultado cuando no se esperaba ninguno."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr ""
@@ -586,63 +585,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, fuzzy, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Este método aún no ha sido implementado."
@@ -661,18 +667,18 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr ""
 "El índice del arreglo esta fuera de rango: {0}, número de elementos: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -683,67 +689,67 @@
 "SQL_ASCII database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
 "type {1} however type {2} was registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr ""
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -755,125 +761,125 @@
 msgid "No results were returned by the query."
 msgstr "La consulta no retornó ningún resultado."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Se retornó un resultado cuando no se esperaba ninguno."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Fallo al crear objeto: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "El intento de conexión falló."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, java-format
 msgid "Invalid elements {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Fallo al crear objeto: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr ""
 
@@ -887,46 +893,46 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 msgid "Unable to find keywords in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -936,83 +942,83 @@
 msgstr ""
 "El índice del arreglo esta fuera de rango: {0}, número de elementos: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1028,8 +1034,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr ""
@@ -1041,7 +1047,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr ""
@@ -1080,8 +1086,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr ""
@@ -1095,7 +1101,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1112,68 +1118,68 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
 "the JDBC 2.1 API Specification, section 5.6 for more details."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr ""
@@ -1238,33 +1244,33 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr ""
@@ -1277,31 +1283,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr ""
 
@@ -1335,34 +1341,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Ha ocorrido un error mientras se establecía la conexión SSL."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1497,129 +1503,129 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 #, fuzzy
 msgid "suspend/resume not implemented"
 msgstr "Este método aún no ha sido implementado."
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/fr.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/fr.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/fr.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/fr.po	2018-08-27 15:38:30.000000000 +0000
@@ -8,7 +8,6 @@
 msgstr ""
 "Project-Id-Version: head-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2007-07-27 12:27+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -19,23 +18,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 "Erreur de chargement des valeurs par d�faut depuis driverconfig.properties"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -43,35 +42,35 @@
 "Quelque chose d''inhabituel a provoqu� l''�chec du pilote. Veuillez faire un "
 "rapport sur cette erreur."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "La tentative de connexion a �chou� dans le d�lai imparti."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Interrompu pendant l''�tablissement de la connexion."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "La fonction {0} n''est pas encore impl�ment�e."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -96,6 +95,13 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+"Incapable d''interpr�ter le nombre de mise � jour dans la balise de "
+"compl�tion de commande�: {0}."
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -119,7 +125,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr "Attendait une fin de fichier du serveur, re�u: {0}"
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -184,24 +190,24 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr ""
 "L''indice de la colonne est hors limite�: {0}, nombre de colonnes�: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Longueur de flux invalide {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Longueur de flux invalide {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -210,28 +216,28 @@
 "Connexion refus�e. V�rifiez que le nom de machine et le port sont corrects "
 "et que postmaster accepte les connexions TCP/IP."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "La tentative de connexion a �chou�."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Le serveur ne supporte pas SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr ""
 "Une erreur s''est produite pendant l''�tablissement de la connexion SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
@@ -239,13 +245,13 @@
 "Le serveur a demand� une authentification par mots de passe, mais aucun mot "
 "de passe n''a �t� fourni."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -257,16 +263,16 @@
 "sous-r�seau et qu''il utilise un sch�ma d''authentification support� par le "
 "pilote."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Erreur de protocole. Ouverture de la session en �chec."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -274,143 +280,143 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 #, fuzzy
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Interrompu pendant l''�tablissement de la connexion."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr "Incapable de lier les valeurs des param�tres pour la commande."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Une erreur d''entr�e/sortie a eu lieu lors d''envoi vers le serveur."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Attendait le statut de commande BEGIN, obtenu {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Statut de commande inattendu�: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Une erreur d''entr�e/sortie a eu lieu lors d''envoi vers le serveur."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Type de r�ponse inconnu {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Une erreur d''entr�e/sortie a eu lieu lors d''envoi vers le serveur."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Attendait une fin de fichier du serveur, re�u: {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
@@ -420,22 +426,15 @@
 "par des sp�cification de longueur tr�s grandes ou incorrectes pour les "
 "param�tres de type InputStream."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr "Ai manqu� de m�moire en r�cup�rant les r�sultats de la requ�te."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Le pilote ne supporte pas actuellement les op�rations COPY."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-"Incapable d''interpr�ter le nombre de mise � jour dans la balise de "
-"compl�tion de commande�: {0}."
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -445,7 +444,7 @@
 "JDBC n�cessite l''affectation de la valeur UNICODE � client_encoding pour un "
 "fonctionnement correct."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -454,7 +453,7 @@
 "Le param�tre DateStyle du serveur a �t� chang� pour {0}. Le pilote JDBC "
 "n�cessite que DateStyle commence par ISO pour un fonctionnement correct."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -518,21 +517,21 @@
 msgid "Unsupported property name: {0}"
 msgstr "Valeur de type non support�e�: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 "Appel Fastpath {0} - Aucun r�sultat n''a �t� retourn� et nous attendions un "
 "entier."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 "Appel Fastpath {0} - Aucun r�sultat n''a �t� retourn� et nous attendions un "
 "entier."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -541,14 +540,14 @@
 "Appel Fastpath {0} - Aucun r�sultat n''a �t� retourn� et nous attendions un "
 "entier."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 "Appel Fastpath {0} - Aucun r�sultat n''a �t� retourn� et nous attendions un "
 "entier."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -557,7 +556,7 @@
 "Appel Fastpath {0} - Aucun r�sultat n''a �t� retourn� et nous attendions un "
 "entier."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "La fonction fastpath {0} est inconnue."
@@ -627,63 +626,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "La fonction {0} n''accepte que quatre et seulement quatre arguments."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "La fonction {0} n''accepte que deux et seulement deux arguments."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "La fonction {0} n''accepte qu''un et un seul argument."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "La fonction {0} n''accepte que deux ou trois arguments."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "La fonction {0} n''accepte aucun argument."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "La fonction {0} n''accepte que trois et seulement trois arguments."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "L''interval {0} n''est pas encore impl�ment�"
@@ -702,17 +708,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Impossible de retrouver le nom d''un savepoint sans nom."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "L''indice du tableau est hors limites�: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "L''indice du tableau est hors limites�: {0}, nombre d''�l�ments�: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -727,18 +733,18 @@
 "cr�ation de la base. L''exemple le plus courant est le stockage de donn�es "
 "8bit dans une base SQL_ASCII."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "Un CallableStatement a �t� ex�cut� mais n''a rien retourn�."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 #, fuzzy
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 "Un CallableStatement a �t� ex�cut� avec un nombre de param�tres incorrect"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -747,7 +753,7 @@
 "Une fonction CallableStatement a �t� ex�cut�e et le param�tre en sortie {0} "
 "�tait du type {1} alors que le type {2} �tait pr�vu."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
@@ -755,12 +761,12 @@
 "Cette requ�te ne d�clare pas de param�tre OUT. Utilisez '{' ?= call ... '}' "
 "pour en d�clarer un."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr "wasNull ne peut pas �tre appel� avant la r�cup�ration d''un r�sultat."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -769,7 +775,7 @@
 "Un param�tre de type {0} a �t� enregistr�, mais un appel � get{1} "
 "(sqltype={2}) a �t� fait."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -777,30 +783,30 @@
 "Un CallableStatement a �t� d�clar�, mais aucun appel � "
 "registerOutParameter(1, <un type>) n''a �t� fait."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr "Aucune fonction outputs n''a �t� enregistr�e."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 "Les r�sultats ne peuvent �tre r�cup�r�s � partir d''un CallableStatement "
 "avant qu''il ne soit ex�cut�."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Valeur de type non support�e�: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr ""
 "Valeur non support�e pour les param�tre de type cha�ne de caract�res�: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -812,131 +818,131 @@
 msgid "No results were returned by the query."
 msgstr "Aucun r�sultat retourn� par la requ�te."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Un r�sultat a �t� retourn� alors qu''aucun n''�tait attendu."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "�chec � la cr�ation de l''objet pour�: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr "Incapable de charger la classe {0} responsable du type de donn�es {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 "Impossible de changer la propri�t� read-only d''une transaction au milieu "
 "d''une transaction."
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "La connexion a �t� ferm�e."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 "Impossible de changer le niveau d''isolation des transactions au milieu "
 "d''une transaction."
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Le niveau d''isolation de transaction {0} n''est pas support�."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Destruction d''une connection qui n''a jamais �t� ferm�e:"
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Impossible de traduire les donn�es dans l''encodage d�sir�."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Fetch size doit �tre une valeur sup�rieur ou �gal � 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Longueur de flux invalide {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Longueur de flux invalide {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "�chec � la cr�ation de l''objet pour�: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 #, fuzzy
 msgid "ClientInfo property not supported."
 msgstr "Le renvoi des cl�s automatiquement g�n�r�es n''est pas support�."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "Query timeout doit �tre une valeur sup�rieure ou �gale � 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "Param�tre holdability du ResultSet inconnu�: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "Impossible d''�tablir un savepoint en mode auto-commit."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "Le renvoi des cl�s automatiquement g�n�r�es n''est pas support�."
 
@@ -953,48 +959,48 @@
 msgstr ""
 "Incapable de trouver le type de donn�e name dans les catalogues syst�mes."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr ""
 "Incapable de trouver le type de donn�e name dans les catalogues syst�mes."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -1004,68 +1010,68 @@
 msgstr ""
 "L''indice du param�tre est hors limites�: {0}, nombre de param�tres�: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 "Impossible d''utiliser les fonctions de requ�te qui utilisent une cha�ne de "
 "caract�res sur un PreparedStatement."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Valeur de Types inconnue."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Longueur de flux invalide {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "La JVM pr�tend ne pas supporter l''encodage {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "L''InputStream fourni a �chou�."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Type inconnu�: {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "Impossible de convertir une instance de {0} vers le type {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Valeur de type non support�e�: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "Impossible de convertir une instance de type {0} vers le type {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
@@ -1075,17 +1081,17 @@
 "Utilisez setObject() avec une valeur de type explicite pour sp�cifier le "
 "type � utiliser."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "Erreur inattendue pendant l''�criture de large object dans la base."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Le Reader fourni a �chou�."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1103,8 +1109,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "Impossible de convertir une instance de type {0} vers le type {1}"
@@ -1118,7 +1124,7 @@
 "l''insertion d''une ligne."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "Constante de direction pour la r�cup�ration invalide�: {0}."
@@ -1163,8 +1169,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "La JVM pr�tend ne pas supporter l''encodage: {0}"
@@ -1179,7 +1185,7 @@
 "Impossible d''appeler updateRow() tant que l''on est sur la ligne ins�r�e."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1200,27 +1206,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "Mauvaise valeur pour le type {0}�: {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Le nom de colonne {0} n''a pas �t� trouv� dans ce ResultSet."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1231,44 +1237,44 @@
 "primaires de cette table. Voir la sp�cification de l''API JDBC 2.1, section "
 "5.6 pour plus de d�tails."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "Ce ResultSet est ferm�."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 "Le ResultSet n''est pas positionn� correctement, vous devez peut-�tre "
 "appeler next()."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 #, fuzzy
 msgid "Invalid UUID data."
 msgstr "Drapeau invalide"
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Le niveau d''isolation de transaction {0} n''est pas support�."
@@ -1335,35 +1341,35 @@
 msgstr ""
 "Le nombre maximum de lignes doit �tre une valeur sup�rieure ou �gale � 0."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "Query timeout doit �tre une valeur sup�rieure ou �gale � 0."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr ""
 "La taille maximum des champs doit �tre une valeur sup�rieure ou �gale � 0."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Ce statement a �t� ferm�."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 #, fuzzy
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr "Le renvoi des cl�s automatiquement g�n�r�es n''est pas support�."
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "Mauvaise valeur pour le type {0}�: {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Valeur de type non support�e�: {0}"
@@ -1376,31 +1382,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Longueur de flux invalide {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Longueur de flux invalide {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "�chec � l''initialisation de l''API LargeObject"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "Les Large Objects ne devraient pas �tre utilis�s en mode auto-commit."
 
@@ -1434,35 +1440,35 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr ""
 "Une erreur s''est produite pendant l''�tablissement de la connexion SSL."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1597,60 +1603,60 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, fuzzy, java-format
 msgid "Invalid flags {0}"
 msgstr "Drapeaux invalides"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "xid ne doit pas �tre nul"
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr "La connection est occup�e avec une autre transaction"
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "suspend/resume pas impl�ment�"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr "Erreur en d�sactivant autocommit"
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, fuzzy, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr "tentative d''appel de fin sans l''appel start correspondant"
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, fuzzy, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1659,34 +1665,34 @@
 "Pas impl�ment�: Prepare doit �tre envoy� sur la m�me connection qui a "
 "d�marr� la transaction"
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, fuzzy, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr "Pr�paration appel�e avant la fin"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, fuzzy, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Erreur en pr�parant la transaction"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr "Erreur durant la restauration"
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, fuzzy, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr "Erreur en annulant une transaction pr�par�e"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
@@ -1694,22 +1700,22 @@
 "Pas impl�ment�: le commit � une phase doit avoir lieu en utilisant la m�me "
 "connection que celle o� il a commenc�"
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, fuzzy, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr "Commit appel� avant la fin"
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, fuzzy, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "Erreur pendant le commit � une phase"
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 #, fuzzy
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
@@ -1718,14 +1724,14 @@
 "Pas impl�ment�: le commit � deux phase doit �tre envoy� sur une connection "
 "inutilis�e"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, fuzzy, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr "Erreur en annulant une transaction pr�par�e"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, fuzzy, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr "Heuristic commit/rollback non support�"
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/it.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/it.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/it.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/it.po	2018-08-27 15:38:30.000000000 +0000
@@ -9,7 +9,6 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL JDBC Driver 8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2006-06-23 17:25+0200\n"
 "Last-Translator: Giuseppe Sacco <eppesuig@debian.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,24 +17,24 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 "Si � verificato un errore caricando le impostazioni predefinite da "
 "�driverconfig.properties�."
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -43,35 +42,35 @@
 "Qualcosa di insolito si � verificato causando il fallimento del driver. Per "
 "favore riferire all''autore del driver questa eccezione."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Il tentativo di connessione � scaduto."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Si � verificata una interruzione durante il tentativo di connessione."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Il metodo �{0}� non � stato ancora implementato."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -96,6 +95,13 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+"Impossibile interpretare il numero degli aggiornamenti nel �tag� di "
+"completamento del comando: {0}."
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -120,7 +126,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr "Ricevuto dal server �{0}� mentre era atteso un EOF"
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -188,23 +194,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "Indice di colonna, {0}, � maggiore del numero di colonne {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "La dimensione specificata, {0}, per lo �stream� non � valida."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "La dimensione specificata, {0}, per lo �stream� non � valida."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -214,27 +220,27 @@
 "corretti, e che il server (postmaster) sia in esecuzione con l''opzione -i, "
 "che abilita le connessioni attraverso la rete TCP/IP."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Il tentativo di connessione � fallito."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Il server non supporta SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Si � verificato un errore impostando la connessione SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
@@ -242,13 +248,13 @@
 "Il server ha richiesto l''autenticazione con password, ma tale password non "
 "� stata fornita."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -260,16 +266,16 @@
 "client, e che lo schema di autenticazione utilizzato sia supportato dal "
 "driver."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Errore di protocollo. Impostazione della sessione fallita."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -277,145 +283,145 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 #, fuzzy
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Si � verificata una interruzione durante il tentativo di connessione."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 "Impossibile fare il �bind� dei valori passati come parametri per lo "
 "statement."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Si � verificato un errore di I/O nella spedizione di dati al server."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Lo stato del comando avrebbe dovuto essere BEGIN, mentre invece � {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Stato del comando non previsto: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Si � verificato un errore di I/O nella spedizione di dati al server."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Risposta di tipo sconosciuto {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Si � verificato un errore di I/O nella spedizione di dati al server."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Ricevuto dal server �{0}� mentre era atteso un EOF"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
@@ -424,22 +430,15 @@
 "Il messaggio di �bind� � troppo lungo ({0}). Questo pu� essere causato da "
 "una dimensione eccessiva o non corretta dei parametri dell''�InputStream�."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr "Fine memoria scaricando i risultati della query."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Il driver non supporta al momento l''operazione �COPY�."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-"Impossibile interpretare il numero degli aggiornamenti nel �tag� di "
-"completamento del comando: {0}."
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -449,7 +448,7 @@
 "JDBC richiede che �client_encoding� sia UNICODE per un corretto "
 "funzionamento."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -458,7 +457,7 @@
 "Il parametro del server �DateStyle� � stato cambiato in {0}. Il driver JDBC "
 "richiede che �DateStyle� cominci con �ISO� per un corretto funzionamento."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, fuzzy, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -523,21 +522,21 @@
 msgid "Unsupported property name: {0}"
 msgstr "Valore di tipo �{0}� non supportato."
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 "Chiamata Fastpath �{0}�: Nessun risultato restituito mentre ci si aspettava "
 "un intero."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 "Chiamata Fastpath �{0}�: Nessun risultato restituito mentre ci si aspettava "
 "un intero."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -546,14 +545,14 @@
 "Chiamata Fastpath �{0}�: Nessun risultato restituito mentre ci si aspettava "
 "un intero."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 "Chiamata Fastpath �{0}�: Nessun risultato restituito mentre ci si aspettava "
 "un intero."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -562,7 +561,7 @@
 "Chiamata Fastpath �{0}�: Nessun risultato restituito mentre ci si aspettava "
 "un intero."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "La funzione fastpath �{0}� � sconosciuta."
@@ -630,63 +629,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "Il metodo �{0}� accetta quattro e solo quattro argomenti."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "Il metodo �{0}� accetta due e solo due argomenti."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "Il metodo �{0}� accetta un ed un solo argomento."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "Il metodo �{0}� accetta due o tre argomenti."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "Il metodo �{0}� non accetta argomenti."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "Il metodo �{0}� accetta tre e solo tre argomenti."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "L''intervallo �{0}� non � stato ancora implementato."
@@ -707,18 +713,18 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Non � possibile trovare il nome di un punto di ripristino anonimo."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Indice di colonna fuori dall''intervallo ammissibile: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr ""
 "L''indice dell''array � fuori intervallo: {0}, numero di elementi: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -734,19 +740,19 @@
 "quello nel quale si memorizzano caratteri a 8bit in un database con codifica "
 "SQL_ASCII."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr ""
 "Un �CallableStatement� � stato eseguito senza produrre alcun risultato. "
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 #, fuzzy
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 "Un �CallableStatement� � stato eseguito con un numero errato di parametri."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -755,7 +761,7 @@
 "� stato eseguito un �CallableStatement� ma il parametro in uscita �{0}� era "
 "di tipo �{1}� al posto di �{2}�, che era stato dichiarato."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
@@ -763,12 +769,12 @@
 "Questo statement non dichiara il parametro in uscita. Usare �{ ?= "
 "call ... }� per farlo."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -777,7 +783,7 @@
 "� stato definito il parametro di tipo �{0}�, ma poi � stato invocato il "
 "metodo �get{1}()� (sqltype={2})."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -785,27 +791,27 @@
 "� stato definito un �CallableStatement� ma non � stato invocato il metodo "
 "�registerOutParameter(1, <tipo>)�."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Valore di tipo �{0}� non supportato."
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Il valore per il parametro di tipo string �{0}� non � supportato."
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -817,132 +823,132 @@
 msgid "No results were returned by the query."
 msgstr "Nessun risultato � stato restituito dalla query."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "� stato restituito un valore nonostante non ne fosse atteso nessuno."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Fallita la creazione dell''oggetto per: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr "Non � possibile caricare la class �{0}� per gestire il tipo �{1}�."
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 "Non � possibile modificare la propriet� �read-only� delle transazioni nel "
 "mezzo di una transazione."
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Questo �Connection� � stato chiuso."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 "Non � possibile cambiare il livello di isolamento delle transazioni nel "
 "mezzo di una transazione."
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Il livello di isolamento delle transazioni �{0}� non � supportato."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Finalizzazione di una �Connection� che non � stata chiusa."
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Impossibile tradurre i dati nella codifica richiesta."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "La dimensione dell''area di �fetch� deve essere maggiore o eguale a 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "La dimensione specificata, {0}, per lo �stream� non � valida."
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "La dimensione specificata, {0}, per lo �stream� non � valida."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Fallita la creazione dell''oggetto per: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 #, fuzzy
 msgid "ClientInfo property not supported."
 msgstr "La restituzione di chiavi autogenerate non � supportata."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "Il timeout relativo alle query deve essere maggiore o eguale a 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "Il parametro �holdability� per il �ResultSet� � sconosciuto: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr ""
 "Non � possibile impostare i punti di ripristino in modalit� �auto-commit�."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "La restituzione di chiavi autogenerate non � supportata."
 
@@ -957,47 +963,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "Non � possibile trovare il datatype �name� nel catalogo di sistema."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "Non � possibile trovare il datatype �name� nel catalogo di sistema."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -1006,68 +1012,68 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "Il parametro indice � fuori intervallo: {0}, numero di elementi: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 "Non si possono utilizzare i metodi \"query\" che hanno come argomento una "
 "stringa nel caso di �PreparedStatement�."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Valore di tipo sconosciuto."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "La dimensione specificata, {0}, per lo �stream� non � valida."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "La JVM sostiene di non supportare la codifica {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "L''�InputStream� fornito � fallito."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Tipo sconosciuto {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "Non � possibile fare il cast di una istanza di �{0}� al tipo �{1}�."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Valore di tipo �{0}� non supportato."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "Non � possibile convertire una istanza di �{0}� nel tipo �{1}�"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
@@ -1077,17 +1083,17 @@
 "�{0}�. Usare �setObject()� specificando esplicitamente il tipo da usare per "
 "questo valore."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "Errore inatteso inviando un �large object� al database."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Il �Reader� fornito � fallito."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1105,8 +1111,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "Non � possibile convertire una istanza di �{0}� nel tipo �{1}�"
@@ -1120,7 +1126,7 @@
 "di una riga."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "Costante per la direzione dell''estrazione non valida: {0}."
@@ -1167,8 +1173,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "La JVM sostiene di non supportare la codifica: {0}."
@@ -1183,7 +1189,7 @@
 "Non � possibile invocare �updateRow()� durante l''inserimento di una riga."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1203,27 +1209,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "Il valore �{1}� non � adeguato al tipo �{0}�."
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Colonna denominata �{0}� non � presente in questo �ResultSet�."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1234,44 +1240,44 @@
 "chiave primaria. Si vedano le specifiche dell''API JDBC 2.1, sezione 5.6, "
 "per ulteriori dettagli."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "Questo �ResultSet� � chiuso."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 "Il �ResultSet� non � correttamente posizionato; forse � necessario invocare "
 "�next()�."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 #, fuzzy
 msgid "Invalid UUID data."
 msgstr "Flag non valido"
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Il livello di isolamento delle transazioni �{0}� non � supportato."
@@ -1337,34 +1343,34 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "Il numero massimo di righe deve essere maggiore o eguale a 0."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "Il timeout relativo alle query deve essere maggiore o eguale a 0."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "La dimensione massima del campo deve essere maggiore o eguale a 0."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Questo statement � stato chiuso."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 #, fuzzy
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr "La restituzione di chiavi autogenerate non � supportata."
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "Il valore �{1}� non � adeguato al tipo �{0}�."
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Valore di tipo �{0}� non supportato."
@@ -1377,31 +1383,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "La dimensione specificata, {0}, per lo �stream� non � valida."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "La dimensione specificata, {0}, per lo �stream� non � valida."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Inizializzazione di LargeObject API fallita."
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "Non � possibile impostare i �Large Object� in modalit� �auto-commit�."
 
@@ -1437,34 +1443,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Si � verificato un errore impostando la connessione SSL."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1600,61 +1606,61 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, fuzzy, java-format
 msgid "Invalid flags {0}"
 msgstr "Flag non validi"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "xid non pu� essere NULL"
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr "La connessione � utilizzata da un''altra transazione"
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "�suspend�/�resume� non implementato"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 #, fuzzy
 msgid "Error disabling autocommit"
 msgstr "Errore durante il commit \"one-phase\""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, fuzzy, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr "� stata chiamata �end� senza la corrispondente chiamata a �start�"
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, fuzzy, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1663,34 +1669,34 @@
 "Non implementato: �Prepare� deve essere eseguito nella stessa connessione "
 "che ha iniziato la transazione."
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, fuzzy, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr "�Prepare� invocato prima della fine"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, fuzzy, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Errore nel preparare una transazione"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr "Errore durante il ripristino"
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, fuzzy, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr "Errore durante il �rollback� di una transazione preparata"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
@@ -1698,22 +1704,22 @@
 "Non implementato: il commit \"one-phase\" deve essere invocato sulla stessa "
 "connessione che ha iniziato la transazione."
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, fuzzy, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr "�Commit� � stato chiamato prima della fine"
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, fuzzy, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "Errore durante il commit \"one-phase\""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 #, fuzzy
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
@@ -1722,14 +1728,14 @@
 "Non implementato: la seconda fase del �commit� deve essere effettuata con "
 "una connessione non in uso"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, fuzzy, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr "Errore durante il �rollback� di una transazione preparata"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, fuzzy, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr "�Commit� e �rollback� euristici non sono supportati"
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/ja.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/ja.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/ja.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/ja.po	2018-08-27 15:38:30.000000000 +0000
@@ -8,447 +8,449 @@
 msgstr ""
 "Project-Id-Version: head-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
-"PO-Revision-Date: 2010-04-11 22:58+0900\n"
-"Last-Translator: Hiroshi Saito <z-saito@guitar.ocn.ne.jp>\n"
+"PO-Revision-Date: 2018-07-23 11:10+0900\n"
+"Last-Translator: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>\n"
 "Language-Team: PostgreSQL <z-saito@guitar.ocn.ne.jp>\n"
-"Language: \n"
+"Language: ja_JP\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
-"X-Poedit-Language: Japanese\n"
-"X-Poedit-Country: Japan\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
-msgstr "driverconfig.propertiesによる初期設定のロードエラー。"
+msgstr "driverconfig.properties からの初期設定ロード中のエラー"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
+"このドライバのプロパティでは以下のキーに対して文字列ではない値が設定されてい"
+"ます: "
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
-"セキュリティ・ポリシーにより、接続試行は妨げられました。おそらく、データベー"
-"ス・サーバ・ホスト接続のためjava.net.SocketPermissionを許可する必要がありま"
-"す。"
+"セキュリティ・ポリシーにより、接続が妨げられました。おそらく、接続先のデータ"
+"ベースサーバのホストとポートに対して java.net.SocketPermission の connect 権"
+"限を許可する必要があります。"
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
-msgstr ""
-"ドライバの失敗を引き起こす異常が起こりました。この例外を報告して下さい。"
+msgstr "何らかの異常によりドライバが動作できません。この例外を報告して下さい。"
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "接続試行がタイムアウトしました。"
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "接続試行中に割り込みがありました。"
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "{0} メソッドはまだ実装されていません。"
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
-#, fuzzy, java-format
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
+#, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
-msgstr "unknownLengthパラメータ値は整数でなければなりません"
+msgstr ""
+"パラメータ {0} の値は整数でなければなりませんが指定された値は {1} でした"
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
-msgstr "CopyInを要求しましたが {0} を得ました。"
+msgstr "CopyIn を要求しましたが {0} が返却されました"
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
-msgstr "CopyOutを要求しましたが {0} を得ました。"
+msgstr "CopyOut を要求しましたが {0} が返却されました"
 
-#: org/postgresql/copy/CopyManager.java:75
-#, fuzzy, java-format
+#: org/postgresql/copy/CopyManager.java:71
+#, java-format
 msgid "Requested CopyDual but got {0}"
-msgstr "CopyOutを要求しましたが {0} を得ました。"
+msgstr "CopyDualを要求しましたが {0} が返却されました。"
 
 #: org/postgresql/copy/PGCopyInputStream.java:51
 #, java-format
 msgid "Copying from database failed: {0}"
-msgstr "データベースからコピーに失敗しました: {0}"
+msgstr "データベースからのコピーに失敗しました: {0}"
 
 #: org/postgresql/copy/PGCopyInputStream.java:67
 #: org/postgresql/copy/PGCopyOutputStream.java:94
 msgid "This copy stream is closed."
-msgstr "コピー・ストリームは閉じられました。"
+msgstr "このコピーストリームはクローズされています。"
 
 #: org/postgresql/copy/PGCopyInputStream.java:110
 msgid "Read from copy failed."
-msgstr "copyからの読み取りに失敗しました。"
+msgstr "コピーストリームからの読み取りに失敗しました。"
 
 #: org/postgresql/copy/PGCopyOutputStream.java:71
 #, java-format
 msgid "Cannot write to copy a byte of value {0}"
-msgstr "値{0}のバイトコピーで書き込みができません。"
+msgstr "バイト値{0}はコピーストリームへの書き込みはできません"
+
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr "コマンド完了タグのカウントをパースできません: {0}"
 
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
-msgstr "要求されたプロトコル {0} を使用して接続することができません。"
+msgstr "要求されたプロトコル {0} で接続することができませんでした。"
 
 #: org/postgresql/core/Oid.java:128
 #, java-format
 msgid "oid type {0} not known and not a number"
-msgstr "数値でない、未知のOID型 {0} です。"
+msgstr "OID型 {0} は未知でかつ数値でもありません"
 
 #: org/postgresql/core/PGStream.java:486
 #, java-format
 msgid "Premature end of input stream, expected {0} bytes, but only read {1}."
 msgstr ""
-"早すぎた入力ストリームの終了です。{0} バイトが想定されましたが、 {1} のみが読"
-"み込まれました。"
+"入力ストリームが途中で終了しました、{0} バイトを読み込もうとしましたが、 {1} "
+"バイトしかありませんでした。"
 
 #: org/postgresql/core/PGStream.java:528
 #, java-format
 msgid "Expected an EOF from server, got: {0}"
-msgstr "サーバからの EOF が想定されましたが、{0} を得ました。"
+msgstr "サーバからの EOF を期待していましたが、{0} が送られてきました"
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
-msgstr "正しくない関数または手続きは、位置 {0} で文法を逸しました。"
+msgstr ""
+"関数またはプロシージャの間違ったエスケープ構文が位置{0}で見つかりました。"
 
 #: org/postgresql/core/SetupQueryRunner.java:64
 msgid "An unexpected result was returned by a query."
-msgstr "クエリによって想定しない結果が返されました。"
+msgstr "クエリが想定外の結果を返却しました。"
 
 #: org/postgresql/core/SocketFactoryFactory.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "The SocketFactory class provided {0} could not be instantiated."
-msgstr "提供のSSLSocketFactoryクラス {0} は、即応しないかもしれません。"
+msgstr "渡された SocketFactoryクラス {0} はインスタンス化できませんでした。"
 
 #: org/postgresql/core/UTF8Encoding.java:28
 #, java-format
 msgid ""
 "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}"
 msgstr ""
-"UTF-8シーケンス違反: {1} バイトシーケンスの {0} バイト は、10xxxxxx でありま"
-"せん: {2}"
+"不正なUTF-8シーケンス: {1} バイトのシーケンス中 {0} バイト目が、10xxxxxx では"
+"ありません: {2}"
 
 #: org/postgresql/core/UTF8Encoding.java:66
 #, java-format
 msgid "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}"
 msgstr ""
-"UTF-8シーケンス違反: {0} バイトを、 {1} バイト値のエンコードに使いました: {2}"
+"不正なUTF-8シーケンス: {1} バイトの値のエンコードに{0} バイト使用しています: "
+"{2}"
 
 #: org/postgresql/core/UTF8Encoding.java:102
 #: org/postgresql/core/UTF8Encoding.java:129
 #, java-format
 msgid "Illegal UTF-8 sequence: initial byte is {0}: {1}"
-msgstr "UTF-8シーケンス違反: 初期バイトは、{0}: {1}"
+msgstr "不正なUTF-8シーケンス: 先頭バイトが {0}: {1}"
 
 #: org/postgresql/core/UTF8Encoding.java:135
 #, java-format
 msgid "Illegal UTF-8 sequence: final value is out of range: {0}"
-msgstr "UTF-8シーケンス違反: 最終値が範囲外です: {0}"
+msgstr "不正なUTF-8シーケンス: 変換後の値が範囲外です: {0}"
 
 #: org/postgresql/core/UTF8Encoding.java:151
 #, java-format
 msgid "Illegal UTF-8 sequence: final value is a surrogate value: {0}"
-msgstr "UTF-8シーケンス違反: 最終値がサロゲート値です: {0}"
+msgstr "不正なUTF-8シーケンス: 変換後の値がサロゲート値です: {0}"
 
 #: org/postgresql/core/Utils.java:93 org/postgresql/core/Utils.java:110
 msgid "Zero bytes may not occur in string parameters."
-msgstr "ゼロ・バイトを文字列パラメータ中に含めることはできません。"
+msgstr "バイト値0を文字列ラメータに含めることはできません。"
 
 #: org/postgresql/core/Utils.java:120 org/postgresql/core/Utils.java:170
 msgid "No IOException expected from StringBuffer or StringBuilder"
 msgstr ""
+"StringBuffer または StringBuilder からの IOException は想定されていません"
 
 #: org/postgresql/core/Utils.java:159
 msgid "Zero bytes may not occur in identifiers."
-msgstr "ゼロ・バイトを識別子に含めることはできません。"
+msgstr "バイト値0を識別子に含めることはできません。"
 
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "列インデックスは範囲外です: {0} , 列の数: {1}"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
-#, fuzzy, java-format
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
+#, java-format
 msgid "Invalid sslmode value: {0}"
-msgstr "無効な sslmode 値です。{0}."
+msgstr "不正な sslmode 値: {0}"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
-#, fuzzy, java-format
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
+#, java-format
 msgid "Invalid targetServerType value: {0}"
-msgstr "無効な sslmode 値です。{0}."
+msgstr "不正な  targetServerType 値です。{0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
-#, fuzzy, java-format
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
+#, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
 "that the postmaster is accepting TCP/IP connections."
 msgstr ""
-"接続は拒絶されました。ホスト名とポート番号が正しいことと、ポストマスタがTCP/"
-"IP接続を受け入れていることを調べて下さい。"
+"{0} への接続が拒絶されました。ホスト名とポート番号が正しいことと、postmaster "
+"がTCP/IP接続を受け付けていることを確認してください。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "接続試行は失敗しました。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
-msgstr ""
+msgstr "指定された targetServerType のサーバーが見つかりません: {0}"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "サーバはSSLをサポートしていません。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "SSL接続のセットアップ中に、エラーが起こりました。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr ""
-"サーバはパスワード・ベースの認証を要求しましたが、いかなるパスワードも提供さ"
-"れませんでした。"
+"サーバはパスワード・ベースの認証を要求しましたが、パスワードが渡されませんで"
+"した。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
+"SCRAM認証はこのドライバではサポートされません。JDK8 以降かつ pgjdbc 42.2.0 以"
+"降(\".jre\"のバージョンではありません)が必要です。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
 "the pg_hba.conf file to include the client''s IP address or subnet, and that "
 "it is using an authentication scheme supported by the driver."
 msgstr ""
-"認証型 {0} はサポートされません。pg_hba.confファイルの構成でクライアントのIP"
-"アドレス、サブネットが含まれているか、そしてドライバがサポートする認証機構を"
-"使っているかを調べてください。"
-
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+"認証タイプ {0} はサポートされません。pg_hba.confでクライアントのIPアドレスま"
+"たはサブネットの指定があり、そのエントリでこのドライバがサポートする認証機構"
+"を使うように設定されていることを確認してください。"
+
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
-msgstr "プロトコルエラー。セッション設定は失敗しました。"
+msgstr "プロトコルエラー。セッションは準備できませんでした。"
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
-msgstr ""
+msgstr "コピー方向 CopyIn はデータを受信できません"
 
 #: org/postgresql/core/v3/CopyOperationImpl.java:54
 msgid "CommandComplete expected COPY but got: "
-msgstr "コマンド完了はCOPYを想定しましたが、次の結果を得ました:"
+msgstr "CommandComplete はCOPYを想定しましたが、次の結果が返却されました:"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
-msgstr "すでに占有している最中のロック取得です。"
+msgstr "すでに取得中のロックを取得しようとしました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
-msgstr "データベース接続のロック中断を試みます。"
+msgstr "データベース接続のロックを破壊しようとしました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
-msgstr "データベース接続でロック待ちの最中に割り込みがありました。"
+msgstr "データベース接続のロック待ちの最中に割り込みがありました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
-msgstr "ステートメントのパラメータ値をバインドできません。"
+msgstr "ステートメントのパラメータ値をバインドできませんでした。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
-#, fuzzy
 msgid "An I/O error occurred while sending to the backend."
-msgstr "バックエンドに送信中に、入出力エラーが起こりました。"
+msgstr "バックエンドへの送信中に、入出力エラーが起こりました。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
-msgstr "BEGINコマンドステータスを想定しましたが、{0} を得ました。"
+msgstr "BEGINコマンドステータスを想定しましたが、{0} が返却されました。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
-msgstr "想定外のコマンドステータス: {0}"
+msgstr "想定外のコマンドステータス: {0}。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
-#, fuzzy
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 msgid "An error occurred while trying to get the socket timeout."
-msgstr "バックエンドに送信中に、入出力エラーが起こりました。"
+msgstr "ソケットタイムアウト取得中にエラーが発生しました。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
-msgstr "未知の応答型 {0} です。"
+msgstr "未知の応答タイプ {0} です。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
-#, fuzzy
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 msgid "An error occurred while trying to reset the socket timeout."
-msgstr "バックエンドに送信中に、入出力エラーが起こりました。"
+msgstr "ソケットタイムアウトのリセット中にエラーが発生しました。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
-msgstr "コピー開始時のデータベース接続に失敗しました。"
+msgstr "コピー開始時のデータベース接続に失敗しました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
-msgstr "動作していないコピー操作の取り消しを試みました。"
+msgstr "実行中ではないコピー操作の中断を試みました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
-msgstr "コピー操作取り消し時のデータベース接続に失敗しました。"
+msgstr "コピー操作中断のためのデータベース接続に失敗しました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
-msgstr "コピー取り消し要求のエラー応答を想定しました。"
+msgstr "予期していたコピーの中断要求へのエラー応答がありませんでした"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
-msgstr "単一copy取り消し要求に {0} エラー応答を得ました。"
+msgstr "一つのコピー中断要求にたいして {0} 個のエラー応答が返されました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
-msgstr "動作していないコピーの終了を試みました。"
+msgstr "実行中ではないコピー操作を終了しようとしました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
-msgstr "コピー終了時のデータベース接続に失敗しました。"
+msgstr "コピー操作の終了中にデータベース接続で異常が発生しました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
-msgstr "動作していないコピー操作で書き込みを試みました。"
+msgstr "実行中ではないコピー操作に書き込もうとしました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
-msgstr "コピーへの書き込み時のデータベース接続に失敗しました。"
+msgstr "コピーへの書き込み中にデータベース接続で異常が発生しました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
-msgstr "動作していないコピーから読み取りを試みました。"
+msgstr "実行中ではないコピーから読み取ろうとしました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
-msgstr "コピーからの読み取り時のデータベース接続に失敗しました。"
+msgstr "コピーからの読み取り中にデータベース接続で異常が発生しました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
-msgstr "活動中のコピー操作なしでCommandComplete ''{0}'' を受け取りました。"
+msgstr ""
+"実行中のコピー操作がないにもかかわらず CommandComplete ''{0}'' を受信しました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
-msgstr "活動中のサーバ {0} からCopyInResponseを得ました"
+msgstr "{0} を実行中のサーバから CopyInResponse を受け取りました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
-msgstr "活動中のサーバ {0} からCopyOutResponseを得ました"
+msgstr "{0} を実行中のサーバから CopyOutResponse を受け取りました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
-#, fuzzy, java-format
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
+#, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
-msgstr "活動中のサーバ {0} からCopyOutResponseを得ました"
+msgstr "{0} を実行中のサーバから CopyOutResponse を受け取りました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
-msgstr "動作中のコピー操作なしでCopyDataを得ました。"
+msgstr "実行中のコピー操作がないにもかかわらず CopyData を受け取りました"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
-msgstr "{0} のサーバからの思いがけない copydata です。"
+msgstr "{0} を実行中のサーバからのあり得ない CopyData"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr "コピー中の想定外のパケット型です: {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
-"バインドメッセージ長 {0} は長すぎます。InputStreamパラメータにとても大きな長"
-"さ、あるいは不正確な長さが設定されている可能性があります。"
+"バインドメッセージ長 {0} は長すぎます。InputStreamのパラメータにとても大きな"
+"長さ、あるいは不正確な長さが設定されている可能性があります。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
-msgstr "クエリの結果取得にメモリを使い果たしました。"
+msgstr "クエリの結果取得中にメモリ不足が起きました。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
-msgstr "現在、ドライバはコピー操作をサポートしません。"
+msgstr "ドライバはコピー操作をサポートしていません。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr "コマンド完了タグの更新数を解釈することができません: {0}"
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
-#, fuzzy, java-format
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
+#, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
 "requires client_encoding to be UTF8 for correct operation."
 msgstr ""
-"サーバのclient_encodingパラメータが {0} に変わりました。JDBCドライバは、正し"
-"い操作のためclient_encodingをUNICODEにすることを要求します。"
+"サーバの client_encoding パラメータが {0} に変わりました。JDBCドライバが正し"
+"く動作するためには、 client_encoding は UTF8 である必要があります。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
 "requires DateStyle to begin with ISO for correct operation."
 msgstr ""
-"サーバのDateStyleパラメータは、{0} に変わりました。JDBCドライバは、正しい操作"
-"のためISOで開始するDateStyleを要求します。"
+"サーバのDateStyleパラメータは、{0} に変わりました。JDBCドライバが正しく動作す"
+"るためには、DateStyle が ISO で始まる値である必要があります。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
 "JDBC driver expected on or off."
 msgstr ""
-"サーバのstandard_conforming_stringsパラメータは、{0}として報告されました。"
-"JDBCドライバは、on または off を想定します。"
+"サーバのstandard_conforming_stringsパラメータは、{0}であると報告されました。"
+"JDBCドライバは、on または off を想定しています。"
 
 #: org/postgresql/core/v3/SimpleParameterList.java:257
 #, java-format
@@ -456,39 +458,38 @@
 msgstr "パラメータ {0} に値が設定されてません。"
 
 #: org/postgresql/core/v3/SimpleParameterList.java:431
-#, fuzzy, java-format
+#, java-format
 msgid "Added parameters index out of range: {0}, number of columns: {1}."
-msgstr "パラメータ・インデックスは範囲外です: {0} , パラメータ数: {1}"
+msgstr "パラメータ・インデックスは範囲外です: {0} , カラム数: {1}"
 
 #: org/postgresql/core/v3/replication/V3PGReplicationStream.java:144
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected packet type during replication: {0}"
-msgstr "コピー中の想定外のパケット型です: {0}"
+msgstr "レプリケーション中に想定外のパケット型: {0}"
 
 #: org/postgresql/core/v3/replication/V3PGReplicationStream.java:269
-#, fuzzy
 msgid "This replication stream has been closed."
-msgstr "この接続は既に閉じられています。"
+msgstr "このレプリケーション接続は既にクローズされています。"
 
 #: org/postgresql/ds/PGPooledConnection.java:118
 msgid "This PooledConnection has already been closed."
-msgstr "PooledConnectionは、すでに閉じられています。"
+msgstr "この PooledConnectionは、すでに閉じられています。"
 
 #: org/postgresql/ds/PGPooledConnection.java:314
 msgid ""
 "Connection has been closed automatically because a new connection was opened "
 "for the same PooledConnection or the PooledConnection has been closed."
 msgstr ""
-"同じPooledConnectionが開かれたので新しい接続は自動的に閉じられました。また"
-"は、PooledConnectionは既に閉じられています。"
+"同じ PooledConnection に対して新しい接続をオープンしたか、この "
+"PooledConnection がクローズされたため、接続が自動的にクローズされました。"
 
 #: org/postgresql/ds/PGPooledConnection.java:315
 msgid "Connection has been closed."
-msgstr "接続は閉じられました。"
+msgstr "接続はクローズされました。"
 
 #: org/postgresql/ds/PGPooledConnection.java:420
 msgid "Statement has been closed."
-msgstr "ステートメントは閉じられました。"
+msgstr "ステートメントはクローズされました。"
 
 #: org/postgresql/ds/PGPoolingDataSource.java:269
 msgid "Failed to setup DataSource."
@@ -496,54 +497,54 @@
 
 #: org/postgresql/ds/PGPoolingDataSource.java:371
 msgid "DataSource has been closed."
-msgstr "データソースは閉じられました。"
+msgstr "データソースはクローズされました。"
 
 #: org/postgresql/ds/common/BaseDataSource.java:1132
 #: org/postgresql/ds/common/BaseDataSource.java:1142
-#, fuzzy, java-format
+#, java-format
 msgid "Unsupported property name: {0}"
-msgstr "サポートされない型の値: {0}."
+msgstr "サポートされていないプロパティ名: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
-#, fuzzy, java-format
+#: org/postgresql/fastpath/Fastpath.java:84
+#, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
-"Fastpath 呼び出し {0} - 整数値を想定しましたが、いかなる結果も返されませんで"
+"Fastpath 呼び出し {0} - numeric を想定していましたが、結果は返却されませんで"
 "した。"
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
-"Fastpath 呼び出し {0} - 整数値を想定しましたが、いかなる結果も返されませんで"
+"Fastpath 呼び出し {0} - integer を想定していましたが、結果は返却されませんで"
 "した。"
 
-#: org/postgresql/fastpath/Fastpath.java:171
-#, fuzzy, java-format
+#: org/postgresql/fastpath/Fastpath.java:169
+#, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr ""
-"Fastpath 呼び出し {0} - 整数値を想定しましたが、いかなる結果も返されませんで"
-"した。"
+"Fastpath 呼び出し {0} - integer を想定していましたが、結果は返却されないかま"
+"たは間違った大きさでした。"
 
-#: org/postgresql/fastpath/Fastpath.java:188
-#, fuzzy, java-format
+#: org/postgresql/fastpath/Fastpath.java:186
+#, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
-"Fastpath 呼び出し {0} - 整数値を想定しましたが、いかなる結果も返されませんで"
-"した。"
+"Fastpath 呼び出し {0} - long を想定していましたが、結果は返却されませんでし"
+"た。"
 
-#: org/postgresql/fastpath/Fastpath.java:196
-#, fuzzy, java-format
+#: org/postgresql/fastpath/Fastpath.java:194
+#, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr ""
-"Fastpath 呼び出し {0} - 整数値を想定しましたが、いかなる結果も返されませんで"
-"した。"
+"Fastpath 呼び出し {0} - long を想定していましたが、結果は返却されないかまたは"
+"間違った大きさでした。"
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "{0} は未知の fastpath 関数です。"
@@ -557,12 +558,12 @@
 #: org/postgresql/geometric/PGpoint.java:76
 #, java-format
 msgid "Conversion to type {0} failed: {1}."
-msgstr "{0} への型変換は失敗しました: {1}."
+msgstr "{0} への型変換に失敗しました: {1}"
 
 #: org/postgresql/geometric/PGpath.java:70
 #, java-format
 msgid "Cannot tell if path is open or closed: {0}."
-msgstr "path が オープンしているか、クローズしているか判別できません: {0}"
+msgstr "経路が開いているか、閉じているか判別できません: {0}"
 
 #: org/postgresql/gss/GssAction.java:137 org/postgresql/gss/MakeGSS.java:66
 #: org/postgresql/gss/MakeGSS.java:74
@@ -573,130 +574,139 @@
 msgid ""
 "Truncation of large objects is only implemented in 8.3 and later servers."
 msgstr ""
-"ラージオブジェクトの除去は、サーババージョンが 8.3 以上で実装されています。"
+"ラージオブジェクトの切り詰めは、バージョン8.3 以降のサーバでのみ実装されてい"
+"ます。"
 
 #: org/postgresql/jdbc/AbstractBlobClob.java:83
 msgid "Cannot truncate LOB to a negative length."
-msgstr "負の値でLOBを削除できません。"
+msgstr "LOBを負の長さに切り詰めることはできません。"
 
 #: org/postgresql/jdbc/AbstractBlobClob.java:90
 #: org/postgresql/jdbc/AbstractBlobClob.java:234
 #, java-format
 msgid "PostgreSQL LOBs can only index to: {0}"
-msgstr "PostgreSQL LOB は、インデックス {0} までのみ可能です。 "
+msgstr "PostgreSQL LOB 上の位置指定は最大 {0} までです"
 
 #: org/postgresql/jdbc/AbstractBlobClob.java:230
 msgid "LOB positioning offsets start at 1."
-msgstr "LOB オフセット開始位置を 1 としてください。"
+msgstr "LOB 位置指定のオフセット値は 1 以上です。"
 
 #: org/postgresql/jdbc/AbstractBlobClob.java:246
 msgid "free() was called on this LOB previously"
-msgstr "以前に、このLOBに対するfree() は呼ばれました。"
+msgstr "このLOBに対して free() はすでに呼び出し済みです"
 
 #: org/postgresql/jdbc/BatchResultHandler.java:92
 msgid "Too many update results were returned."
-msgstr "多すぎる更新結果が返されました。"
+msgstr "返却された更新結果が多すぎます。"
 
 #: org/postgresql/jdbc/BatchResultHandler.java:146
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Batch entry {0} {1} was aborted: {2}  Call getNextException to see other "
 "errors in the batch."
 msgstr ""
-"バッチ投入 {0} {1} は停止しました。getNextExceptionを呼んで原因を見て下さい。"
+"バッチ {0} {1} はアボートしました: {2} このバッチの他のエラーは "
+"getNextException を呼び出すことで確認できます。"
 
 #: org/postgresql/jdbc/BooleanTypeUtil.java:99
 #, java-format
 msgid "Cannot cast to boolean: \"{0}\""
-msgstr ""
+msgstr "boolean へのキャストはできません: \"{0}\""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
-msgstr "{0} 関数は、四つの引数のみを用います。"
+msgstr "{0} 関数はちょうど4個の引数を取ります。"
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
-msgstr "{0} 関数は、二つの引数のみを用います。"
+msgstr "{0} 関数はちょうど2個の引数を取ります。"
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
-msgstr "{0} 関数は、単一の引数のみを用います。"
+msgstr "{0} 関数はちょうど1個の引数を取ります。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
-msgstr "{0} 関数は、二つ、または三つの引数を用います。"
+msgstr "{0} 関数は2個、または3個の引数を取ります。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
-msgstr "{0} 関数は、どのような引数も用いません。"
+msgstr "{0} 関数は引数を取りません。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
-msgstr "{0} 関数は、三つの引数のみを用います。"
+msgstr "{0} 関数はちょうど3個の引数を取ります。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
-msgstr "間隔 {0} はまだ実装されていません。"
+msgstr "時間間隔 {0} は実装されていません"
 
 #: org/postgresql/jdbc/PSQLSavepoint.java:37
 #: org/postgresql/jdbc/PSQLSavepoint.java:51
 #: org/postgresql/jdbc/PSQLSavepoint.java:69
 msgid "Cannot reference a savepoint after it has been released."
-msgstr "savepointは、解放された後で参照することはできません。"
+msgstr "解放された savepoint は参照できません。"
 
 #: org/postgresql/jdbc/PSQLSavepoint.java:42
 msgid "Cannot retrieve the id of a named savepoint."
-msgstr "名前の付いたsavepointのidを取得することができません。"
+msgstr "名前付き savepoint の id は取得できません。"
 
 #: org/postgresql/jdbc/PSQLSavepoint.java:56
 msgid "Cannot retrieve the name of an unnamed savepoint."
-msgstr "名前のないsavepointの名前を取得することができません。"
+msgstr "無名 savepoint の名前は取得できません。"
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
-msgstr "配列インデックスは、範囲外です: {0}"
+msgstr "配列インデックスが範囲外です: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
-msgstr "配列インデックスは、範囲外です: {0} 、要素の数: {1}"
+msgstr "配列インデックスが範囲外です: {0} 、要素の数: {1}"
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -706,51 +716,51 @@
 "was created in.  The most common example of this is storing 8bit data in a "
 "SQL_ASCII database."
 msgstr ""
-"不正な文字データが見つかりました。これは、恐らく作成されたデータベースの文字"
-"セットにとって無効である文字を含むデータが格納されたことによって引き起こされ"
-"ます。最も一般的な例は、SQL_ASCIIデータベースに保存された8bitデータ等です。"
+"不正な文字データが見つかりました。これはデータベース作成時の文字セットに対し"
+"て不正な文字を含むデータが格納されているために起きている可能性が高いです。最"
+"も一般的な例は、SQL_ASCIIデータベースに8bitデータが保存されている場合です。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
-msgstr "CallableStatementは、戻りなしで実行されました。"
+msgstr "CallableStatement が実行されましたがなにも返却されませんでした。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
-msgstr "CallableStatementは、不正な数のパラメータで実行されました。"
+msgstr "CallableStatement は不正な数のパラメータで実行されました。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
 "type {1} however type {2} was registered."
 msgstr ""
-"CallableStatement機能が実行され、出力パラメータ {0} は、型 {1} でした。しか"
-"し、型 {2} が登録されました。"
+"CallableStatement 関数が実行され、出力パラメータ {0} は {1} 型 でした。しか"
+"し、{2} 型 が登録されました。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr ""
-"ステートメントは、OUTパラメータを宣言していません。'{' ?= call ... '}' を使っ"
-"て宣言して下さい。"
+"このステートメントは、OUTパラメータを宣言していません。'{' ?= call ... '}' を"
+"使って宣言して下さい。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr "wasNullは、結果フェッチ前に呼び出せません。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr ""
-"型 {0}  のパラメータが登録されましたが、get{1} (sqltype={2}) が呼び出されまし"
+"{0} 型のパラメータが登録されましたが、get{1} (sqltype={2}) が呼び出されまし"
 "た。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -758,27 +768,27 @@
 "CallableStatementは宣言されましたが、registerOutParameter(1, <some type>) は"
 "呼び出されませんでした。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
-msgstr "関数出力は登録されませんでした。"
+msgstr "関数出力は登録されていません。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
-msgstr "実行される前に、CallableStatement から結果を得ることはできません。"
+msgstr "実行前の CallableStatement から結果の取得はできません。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
-#, fuzzy, java-format
+#: org/postgresql/jdbc/PgCallableStatement.java:686
+#, java-format
 msgid "Unsupported type conversion to {1}."
-msgstr "サポートされないバイナリエンコーディングです: {0}."
+msgstr "{1} への型変換はサポートされていません。"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "サポートされないstringtypeパラメータ値です: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -788,128 +798,126 @@
 #: org/postgresql/jdbc/TypeInfoCache.java:526
 #: org/postgresql/jdbc/TypeInfoCache.java:531
 msgid "No results were returned by the query."
-msgstr "いかなる結果も、クエリによって返されませんでした。"
+msgstr "クエリは結果を返却しませんでした。"
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
-msgstr "結果がないことを想定しましたが、結果が返されました。"
+msgstr "ないはずの結果が返却されました。"
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr "カスタム型マップはサポートされません。"
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
-msgstr "{0} へのオブジェクト生成に失敗しました。"
+msgstr "{0} のオブジェクトの生成に失敗しました。"
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr "データ型 {1} に対応するクラス{0} をロードできません。"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
-msgstr ""
-"トランザクションの最中に読み出し専用プロパティを変えることはできません。"
+msgstr "トランザクションの中で read-only プロパティは変更できません。"
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr "autoCommit有効時に、明示的なコミットはできません。"
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 msgid "This connection has been closed."
-msgstr "この接続は既に閉じられています。"
+msgstr "このコネクションは既にクローズされています。"
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr "autoCommit有効時に、明示的なロールバックはできません。"
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
-msgstr "トランザクションの最中に隔離レベルを変えることができません。"
+msgstr "トランザクションの中でトランザクション分離レベルは変更できません。"
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
-msgstr "トランザクション隔離レベル{0} はサポートされていません。"
+msgstr "トランザクション分離レベル{0} はサポートされていません。"
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
-msgstr "接続終了で閉じられませんでした:"
+msgstr "クローズされていないコネクションの終了処理を行います: "
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
-msgstr "望む符号化にデータを訳すことができません。"
+msgstr "データを指定されたエンコーディングに変換することができません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
-msgstr "フェッチサイズは、0に等しいか、より大きな値でなくてはなりません。"
+msgstr "フェッチサイズは、0または、より大きな値でなくてはなりません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
-msgstr "提供名 {0} で、サーバの配列型を見つけることができません。"
+msgstr "指定された名前 {0} のサーバ配列型はありません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1312
-#, fuzzy, java-format
+#: org/postgresql/jdbc/PgConnection.java:1329
+#, java-format
 msgid "Invalid elements {0}"
-msgstr "無効なフラグです。{0}"
+msgstr "不正な要素です: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
-#, fuzzy, java-format
+#: org/postgresql/jdbc/PgConnection.java:1365
+#, java-format
 msgid "Invalid timeout ({0}<0)."
-msgstr "無効なタイムアウト値です ({0}<0)。"
+msgstr "不正なタイムアウト値 ({0}<0)。"
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
-msgstr "有効確認の接続"
+msgstr "コネクションを検証しています"
 
-#: org/postgresql/jdbc/PgConnection.java:1405
-#, fuzzy, java-format
+#: org/postgresql/jdbc/PgConnection.java:1422
+#, java-format
 msgid "Failed to set ClientInfo property: {0}"
-msgstr "ClientInfo プロパティ:{0} の設定に失敗しました。"
+msgstr "ClientInfo のプロパティの設定に失敗しました: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr "ClientInfo プロパティはサポートされていません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
-msgstr ""
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
+msgstr "1つ以上の ClinentInfo で問題が発生しました。"
 
-#: org/postgresql/jdbc/PgConnection.java:1540
-#, fuzzy
+#: org/postgresql/jdbc/PgConnection.java:1559
 msgid "Network timeout must be a value greater than or equal to 0."
-msgstr "クエリタイムアウトは、0に等しいか、より大きな値でなくてはなりません。"
+msgstr "ネットワークタイムアウトは、0またはより大きな値でなくてはなりません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
-msgstr ""
+msgstr "ネットワークタイムアウトが設定できません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
-msgstr ""
+msgstr "ネットワークタイムアウトが取得できません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
-msgstr "未知の ResultSet に対するholdability設定です: {0}"
+msgstr "ResultSet の holdability に対する未知の設定値です: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "自動コミットモードでsavepointを作成できません。"
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "自動生成キーを返すことはサポートされていません。"
 
@@ -917,146 +925,143 @@
 msgid ""
 "Unable to determine a value for MaxIndexKeys due to missing system catalog "
 "data."
-msgstr ""
-"間違ったシステム・カタログ・データのためにMaxIndexKeysの値を決めることができ"
-"ません。"
+msgstr "システムカタログにデータがないため MaxIndexKeys の値を決定できません。"
 
 #: org/postgresql/jdbc/PgDatabaseMetaData.java:82
 msgid "Unable to find name datatype in the system catalogs."
-msgstr "名前データ型をシステムカタログで見つけることができません。"
+msgstr "name データ型がシステムカタログにありません。"
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
-#, fuzzy
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 msgid "Unable to find keywords in the system catalogs."
-msgstr "名前データ型をシステムカタログで見つけることができません。"
+msgstr "キーワードはシステムカタログにありません。"
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
 #: org/postgresql/jdbc/PgParameterMetaData.java:83
 #, java-format
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
-msgstr "パラメータ・インデックスは範囲外です: {0} , パラメータ数: {1}"
+msgstr "パラメータのインデックスが範囲外です: {0} , パラメータ数: {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
-msgstr "PreparedStatementでクエリ文字を持ったクエリメソッドは使えません。"
+msgstr "PreparedStatement でクエリ文字列を取るクエリメソッドは使えません。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
-msgstr "未知の型の値です。"
+msgstr "未知の Types の値です。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
-msgstr "無効なストリーム長 {0}."
+msgstr "不正なストリーム長 {0}。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "JVMは、エンコーディング {0} をサポートしません。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
-msgstr "提供された InputStream は失敗しました。"
+msgstr "渡された InputStream で異常が発生しました。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "未知の型 {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr "hstore 拡張がインストールされてません。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
-msgstr "インスタンス {0} を型 {1} へキャストできません"
+msgstr "{0} のインスタンスは {1} 型へキャストできません"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
-msgstr "サポートされない型の値: {0}."
+msgstr "サポートされない Types の値: {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
-msgstr "型 {1} に {0} のインスタンスを変換できません。"
+msgstr "{0} のインスタンスは {1} 型に変換できません"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
-"インスタンス {0} で使うべきSQL型を推測できません。明確な型値を記述した "
-"setObject() を使ってください。"
+"{0} のインスタンスに対して使うべきSQL型を推測できません。明示的な Types 引数"
+"をとる setObject() で使うべき型を指定してください。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr ""
 "データベースへのラージオブジェクト書き込み中に想定外のエラーが起きました。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
-msgstr "提供された Reader は失敗しました。"
+msgstr "渡された Reader で異常が発生しました。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
-msgstr "プロトコルで送信するにはオブジェクトが大きすぎます。"
+msgstr "オブジェクトが大きすぎてこのプロトコルでは送信できません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:280
 msgid ""
@@ -1071,23 +1076,23 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
-#, fuzzy, java-format
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
+#, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
-msgstr "型 {0} の列値を型 {1} に変換できません。"
+msgstr "{0}型のカラムの値を指定の型 {1} に変換できませんでした。"
 
 #: org/postgresql/jdbc/PgResultSet.java:838
 #: org/postgresql/jdbc/PgResultSet.java:859
 #: org/postgresql/jdbc/PgResultSet.java:1832
 msgid "Can''t use relative move methods while on the insert row."
-msgstr "行挿入の最中に関連の動作方法を使うことはできません。"
+msgstr "行挿入中に相対移動メソッドは使えません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
-msgstr "無効なフェッチ方向の定数です: {0}"
+msgstr "不正なフェッチ方向の定数です: {0}"
 
 #: org/postgresql/jdbc/PgResultSet.java:889
 msgid "Cannot call cancelRowUpdates() when on the insert row."
@@ -1102,24 +1107,22 @@
 "Currently positioned before the start of the ResultSet.  You cannot call "
 "deleteRow() here."
 msgstr ""
-"ResultSetの開始の前に位置していました。ここでdeleteRow()を呼ぶことはできませ"
-"ん。"
+"RsultSet の開始点より前にいるため、deleteRow() を呼ぶことはできません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:918
 msgid ""
 "Currently positioned after the end of the ResultSet.  You cannot call "
 "deleteRow() here."
 msgstr ""
-"ResultSetの終わりの後に位置していました。ここでdeleteRow()を呼ぶことはできま"
-"せん。"
+"ResultSet の最後尾より後ろにいるため、deleteRow() を呼ぶことはできません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:922
 msgid "There are no rows in this ResultSet."
-msgstr "このResultSetにいかなる行もありません。"
+msgstr "このResultSetに行がありません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:963
 msgid "Not on the insert row."
-msgstr "挿入行がありません。"
+msgstr "挿入行上にいません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:965
 msgid "You must specify at least one column value to insert a row."
@@ -1127,111 +1130,112 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "JVMでサポートされないエンコーディングです: {0}"
 
 #: org/postgresql/jdbc/PgResultSet.java:1261
 msgid "Can''t refresh the insert row."
-msgstr "挿入行を回復することはできません。"
+msgstr "挿入行を再フェッチすることはできません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:1328
 msgid "Cannot call updateRow() when on the insert row."
-msgstr "行を挿入したときに、updateRow() を呼び出すことができません。"
+msgstr "挿入行上では updateRow() を呼び出すことができません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
-msgstr "開始前もしくは終了後であるため、ResultSetを更新することができません。"
+msgstr ""
+"開始位置より前もしくは終了位置より後ろであるため、ResultSetを更新することがで"
+"きません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:1535
 msgid "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated."
-msgstr "CONCUR_READ_ONLYを伴うResultSetsは更新できません。"
+msgstr "CONCUR_READ_ONLYに設定されている ResultSet は更新できません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:1603
 #, java-format
 msgid "No primary key found for table {0}."
-msgstr "テーブル {0} の主キーがありません。"
+msgstr "テーブル {0} には主キーがありません。"
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
-msgstr "型 {0} で不正な値 : {1}"
+msgstr "型 {0} に対する不正な値 : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
-msgstr "ResultSet に列名 {0} は見つかりませんでした。"
+msgstr "この ResultSet に列名 {0} ありません。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
 "the JDBC 2.1 API Specification, section 5.6 for more details."
 msgstr ""
-"ResultSetは変更可能ではありません。この結果セットを生成したクエリは、ただ一つ"
-"のテーブルを選び、そのテーブルから全ての主キーを選ばなくてはいけません。より"
-"多くの詳細に関して JDBC 2.1 API仕様、章 5.6 を参照して下さい。"
+"ResultSetは更新不可です。この結果セットを生成したクエリは、ただ一つのテーブル"
+"を選択して、そのテーブルの全ての主キーを選択する必要があります。詳細に関して"
+"は JDBC 2.1 API仕様、章 5.6 を参照して下さい。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
-msgstr "ResultSetは閉じられました。"
+msgstr "この ResultSet はクローズされています。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
-msgstr ""
-"適切な位置を指していないResultSetです。おそらく、nextを呼ぶ必要があります。"
+msgstr "適切な位置にいない ResultSetです。おそらく、nextを呼ぶ必要があります。"
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
-msgstr "無効なUUIDデータです。"
+msgstr "不正なUUIDデータです。"
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
-#, fuzzy, java-format
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
+#, java-format
 msgid "conversion to {0} from {1} not supported"
-msgstr "トランザクション隔離レベル{0} はサポートされていません。"
+msgstr "{1} から {0} への変換はサポートされていません。"
 
 #: org/postgresql/jdbc/PgSQLXML.java:147
 msgid "Unable to decode xml data."
-msgstr "xmlデータを復号化できません。"
+msgstr "xmlデータをデコードできません。"
 
 #: org/postgresql/jdbc/PgSQLXML.java:150
 #, java-format
@@ -1270,13 +1274,14 @@
 
 #: org/postgresql/jdbc/PgSQLXML.java:273
 msgid "Unable to convert DOMResult SQLXML data to a string."
-msgstr "DOMResult SQLXMLデータを文字列に変えることができません。"
+msgstr "DOMResult SQLXMLデータを文字列に変換することができません。"
 
 #: org/postgresql/jdbc/PgSQLXML.java:287
 msgid ""
 "This SQLXML object has already been initialized, so you cannot manipulate it "
 "further."
-msgstr "このSQLXMLオブジェクトは既に初期化されたため、これ以上操作できません。"
+msgstr ""
+"このSQLXMLオブジェクトは既に初期化済みであるため、これ以上操作できません。"
 
 #: org/postgresql/jdbc/PgStatement.java:235
 msgid "Multiple ResultSets were returned by the query."
@@ -1284,88 +1289,88 @@
 
 #: org/postgresql/jdbc/PgStatement.java:316
 msgid "Can''t use executeWithFlags(int) on a Statement."
-msgstr ""
+msgstr "executeWithFlags(int) は Statement インスタンスでは使えません。"
 
 #: org/postgresql/jdbc/PgStatement.java:509
 msgid "Maximum number of rows must be a value grater than or equal to 0."
-msgstr "行の最大数は、0に等しいか、より大きな値でなくてはなりません。"
+msgstr "行数の制限値は 0またはより大きな値でなくてはなりません。"
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
-msgstr "クエリタイムアウトは、0に等しいか、より大きな値でなくてはなりません。"
+msgstr "クエリタイムアウトは、0またはより大きな値でなくてはなりません。"
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
-msgstr "最大の項目サイズは、0に等しいか、より大きな値でなくてはなりません。"
+msgstr "最大の項目サイズは、0またはより大きな値でなくてはなりません。"
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
-msgstr "このステートメントは閉じられました。"
+msgstr "このステートメントはクローズされています。"
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr "列インデックスで自動生成キーを返すことはサポートされていません。"
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
-#, fuzzy, java-format
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
+#, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
-msgstr "型 {0} で不正な値 : {1}"
+msgstr "timestamp/date/time 型に対する不正な値: {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
-#, fuzzy, java-format
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
+#, java-format
 msgid "Unsupported binary encoding of {0}."
-msgstr "サポートされないバイナリエンコーディングです: {0}."
+msgstr "{0} 型に対するサポートされないバイナリエンコーディング。"
 
 #: org/postgresql/jre8/sasl/ScramAuthenticator.java:68
 msgid "No SCRAM mechanism(s) advertised by the server"
-msgstr ""
+msgstr "サーバは SCRAM認証機構を広告していません"
 
 #: org/postgresql/jre8/sasl/ScramAuthenticator.java:81
 msgid "Invalid or unsupported by client SCRAM mechanisms"
-msgstr ""
+msgstr "不正であるかクライアントのSCRAM機構でサポートされていません"
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
-#, fuzzy, java-format
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
+#, java-format
 msgid "Invalid server-first-message: {0}"
-msgstr "無効な sslmode 値です。{0}."
+msgstr "不正な server-first-message: {0}"
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
-#, fuzzy, java-format
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
+#, java-format
 msgid "Invalid server-final-message: {0}"
-msgstr "無効な sslmode 値です。{0}."
+msgstr "不正な server-final-message: {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
-msgstr ""
+msgstr "スクラム認証が失敗しました、サーバはエラーを返却しました:  {0}"
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
-msgstr ""
+msgstr "不正なサーバSCRAM署名です"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "ラージオブジェクトAPIの初期化に失敗しました。"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "ラージオブジェクトは、自動コミットモードで使うことができません。"
 
 #: org/postgresql/osgi/PGDataSourceFactory.java:82
-#, fuzzy, java-format
+#, java-format
 msgid "Unsupported properties: {0}"
-msgstr "サポートされない型の値: {0}."
+msgstr "サポートされないプロパティ: {0}"
 
 #: org/postgresql/ssl/MakeSSL.java:52
 #, java-format
 msgid "The SSLSocketFactory class provided {0} could not be instantiated."
-msgstr "提供のSSLSocketFactoryクラス {0} は、即応しないかもしれません。"
+msgstr "渡された SSLSocketFactoryクラス {0} はインスタンス化できませんでした。"
 
 #: org/postgresql/ssl/MakeSSL.java:67
 #, java-format
@@ -1373,50 +1378,52 @@
 msgstr "SSL エラー: {0}"
 
 #: org/postgresql/ssl/MakeSSL.java:78
-#, fuzzy, java-format
+#, java-format
 msgid "The HostnameVerifier class provided {0} could not be instantiated."
-msgstr "提供されたHostnameVerifierクラス {0} は、即応しないかもしれません。"
+msgstr "与えれた HostnameVerifier クラス {0} はインスタンス化できませんした。"
 
 #: org/postgresql/ssl/MakeSSL.java:84
 #, java-format
 msgid "The hostname {0} could not be verified by hostnameverifier {1}."
-msgstr "ホスト名 {0} は、hostnameverifier {1} で確認できませんでした。"
+msgstr "ホスト名 {0} は、hostnameverifier {1} で検証できませんでした。"
 
 #: org/postgresql/ssl/MakeSSL.java:93
 #, java-format
 msgid "The hostname {0} could not be verified."
-msgstr "ホスト名 {0} は確認できませんでした。"
+msgstr "ホスト名 {0} は検証できませんでした。"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
-msgstr ""
+msgstr "プロパティ sslfactoryarg は空であってはなりません。"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
-msgstr ""
+msgstr "サーバのSSL証明書を指定する環境変数は空であってはなりません。"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
+"サーバーのSSL証明書を指定するシステムプロパティは空であってはなりません。"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
+"プロパティ sslfactoryarg の先頭はプリフィクス file:, classpath:, env:, sys: "
+"もしくは -----BEGIN CERTIFICATE----- のいずれかでなければなりません。"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
-#, fuzzy
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 msgid "An error occurred reading the certificate"
-msgstr "SSL接続のセットアップ中に、エラーが起こりました。"
+msgstr "証明書の読み込み中にエラーが起きました"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
-msgstr ""
+msgstr "X509TrustManager が見つかりません"
 
 #: org/postgresql/ssl/jdbc4/LazyKeyManager.java:133
 msgid ""
@@ -1434,7 +1441,7 @@
 #: org/postgresql/ssl/jdbc4/LazyKeyManager.java:148
 #, java-format
 msgid "Loading the SSL certificate {0} into a KeyManager failed."
-msgstr "SSL証明書 {0} のKeyManagerへの読み込みに失敗しました。"
+msgstr "SSL証明書 {0} をKeyManagerへ読み込めませんでした。"
 
 #: org/postgresql/ssl/jdbc4/LazyKeyManager.java:205
 msgid "Enter SSL password: "
@@ -1467,14 +1474,15 @@
 msgstr "javaの暗号化アルゴリズム {0} を見つけることができませんでした。"
 
 #: org/postgresql/ssl/jdbc4/LibPQFactory.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "The password callback class provided {0} could not be instantiated."
-msgstr "提供されたpassword callbackクラス {0} は、即応しないかもしれません。"
+msgstr ""
+"渡されたパスワードコールバッククラス {0} はインスタンス化できませんでした。"
 
 #: org/postgresql/ssl/jdbc4/LibPQFactory.java:132
 #, java-format
 msgid "Could not open SSL root certificate file {0}."
-msgstr "SSLルート証明書ファイル {0} を開けませんでした。"
+msgstr "SSLルート証明書ファイル {0} をオープンできませんでした。"
 
 #: org/postgresql/ssl/jdbc4/LibPQFactory.java:147
 #, java-format
@@ -1484,19 +1492,19 @@
 #: org/postgresql/ssl/jdbc4/LibPQFactory.java:151
 #, java-format
 msgid "Loading the SSL root certificate {0} into a TrustManager failed."
-msgstr "SSLルート証明書 {0} のTrustManagerへの読み込みに失敗しました。"
+msgstr "SSLルート証明書 {0} をTrustManagerへ読み込めませんでした。"
 
 #: org/postgresql/ssl/jdbc4/LibPQFactory.java:170
 msgid "Could not initialize SSL context."
-msgstr "SSL contextを初期化できませんでした。"
+msgstr "SSLコンテクストを初期化できませんでした。"
 
 #: org/postgresql/util/PGInterval.java:152
 msgid "Conversion of interval failed"
-msgstr "intervalの変換に失敗しました。"
+msgstr "時間間隔の変換に失敗しました。"
 
 #: org/postgresql/util/PGmoney.java:62
 msgid "Conversion of money failed."
-msgstr "moneyの変換に失敗しました。"
+msgstr "貨幣金額の変換に失敗しました。"
 
 #: org/postgresql/util/ServerErrorMessage.java:45
 #, java-format
@@ -1505,6 +1513,9 @@
 "readable, please check database logs and/or host, port, dbname, user, "
 "password, pg_hba.conf)"
 msgstr ""
+"(pgjdbc: server-encoding として {0}  を自動検出しました、メッセージが読めない"
+"場合はデータベースログおよび host, port, dbname, user, password, pg_dba.conf "
+"を確認してください)"
 
 #: org/postgresql/util/ServerErrorMessage.java:176
 #, java-format
@@ -1519,7 +1530,7 @@
 #: org/postgresql/util/ServerErrorMessage.java:185
 #, java-format
 msgid "Position: {0}"
-msgstr "ポジション: {0}"
+msgstr "位置: {0}"
 
 #: org/postgresql/util/ServerErrorMessage.java:189
 #, java-format
@@ -1529,12 +1540,12 @@
 #: org/postgresql/util/ServerErrorMessage.java:195
 #, java-format
 msgid "Internal Query: {0}"
-msgstr "インターナル・クエリ: {0}"
+msgstr "内部クエリ: {0}"
 
 #: org/postgresql/util/ServerErrorMessage.java:199
 #, java-format
 msgid "Internal Position: {0}"
-msgstr "インターナル・ポジション: {0}"
+msgstr "内部位置: {0}"
 
 #: org/postgresql/util/ServerErrorMessage.java:206
 #, java-format
@@ -1551,130 +1562,132 @@
 "Transaction control methods setAutoCommit(true), commit, rollback and "
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
-"トランザクション制御メソッドである setAutoCommit(true), commit, rollback, "
-"setSavePoint は、XAトランザクションが有効では利用できません。"
+"トランザクション制御メソッド setAutoCommit(true), commit, rollback, "
+"setSavePoint は、XAトランザクションが有効である間は利用できません。"
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
-msgstr "無効なフラグです。{0}"
+msgstr "不正なフラグ {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "xidはnullではいけません。"
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
-msgstr "接続は、別のトランザクションに対応中です。"
+msgstr "接続は、別のトランザクションを処理中です"
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "停止/再開 は実装されていません。"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
-"Transaction interleaving は実装されていません。xid={0}, currentXid={1}, "
-"state={2}, flags={3}"
+"不正なプロトコル状態が要求されました。Transaction interleaving を試みましたが"
+"実装されていません。xid={0}, currentXid={1}, state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
-msgstr "自動コミットの無効化エラー"
+msgstr "自動コミットの無効化処理中のエラー"
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
-"対応する開始呼び出しなしで、終了呼び出しました。state={0}, start xid={1}, "
-"currentXid={2}, preparedXid={3}"
+"対応する start の呼び出しなしで、end を呼び出しました。state={0}, start "
+"xid={1}, currentXid={2}, preparedXid={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:297
-#, fuzzy, java-format
+#: org/postgresql/xa/PGXAConnection.java:326
+#, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
-"準備トランザクションのロールバックエラー rollback xid={0}, preparedXid={1}, "
-"currentXid={2}"
+"すでにプリペアされているトランザクションをプリペアしようとしました、プリペア"
+"されている xid={0}, プリペアしようとした xid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
-msgstr ""
+msgstr "この接続は xid と関連付けられていません。プリペア xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
-"実装されていません: Prepareは、トランザクションを開始したときと同じ接続で使わ"
-"なくてはなりません。currentXid={0}, prepare xid={1}"
+"実装されていません: Prepareは、トランザクションを開始したものと同じコネクショ"
+"ンで発行しなくてはなりません。currentXid={0}, prepare xid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
-msgstr "終了前に\"Prepare\"が呼ばれました prepare xid={0}, state={1}"
+msgstr "end より前に prepare が呼ばれました prepare xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "トランザクションの準備エラー。prepare xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
-msgstr "回復中にエラー"
+msgstr "recover 処理中のエラー"
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
-"準備トランザクションのロールバックエラー rollback xid={0}, preparedXid={1}, "
-"currentXid={2}"
+"プリペアドトランザクションのロールバック中のエラー rollback xid={0}, "
+"preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
+"単相コミットが xid {0} に対してよびだされましたが、コネクションは xid {1} と"
+"関連付けられています"
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
-"実装されていません: 単一フェーズのCOMMITは、開始時と同じ接続で実行されなけれ"
+"実装されていません: 単一フェーズのCOMMITは、開始時と同じ接続で発行されなけれ"
 "ばなりません。"
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
-msgstr ""
+msgstr "未知の xid の単相コミット。 コミットxid={0}, 現在のxid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
-msgstr "終了の前に COMMIT を呼びました commit xid={0}, state={1}"
+msgstr "end の前に COMMIT を呼びました commit xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
-msgstr "単一フェーズのCOMMITの最中にエラー commit xid={0}"
+msgstr "単一フェーズのCOMMITの処理中のエラー commit xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
@@ -1682,16 +1695,17 @@
 "実装されていません: 第二フェーズの COMMIT は、待機接続で使わなくてはなりませ"
 "ん。xid={0}, currentXid={1}, state={2], transactionState={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
-"準備トランザクションのコミットエラー。commit xid={0}, preparedXid={1}, "
-"currentXid={2}"
+"プリペアドトランザクションの COMMIT 処理中のエラー。commit xid={0}, "
+"preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
-msgstr "サポートされない commit/rollback が見つかりました。forget xid={0}"
+msgstr ""
+"ヒューリスティック commit/rollback はサポートされません。forget xid={0}"
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_bg.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_bg.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_bg.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_bg.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,405 +5,405 @@
   static {
     java.lang.String[] t = new java.lang.String[890];
     t[0] = "";
-    t[1] = "Project-Id-Version: JDBC Driver for PostgreSQL 8.x\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2009-12-28 00:01+0100\nLast-Translator: <usun0v@mail.bg>\nLanguage-Team: <bg@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Bulgarian\nX-Poedit-Country: BULGARIA\n";
+    t[1] = "Project-Id-Version: JDBC Driver for PostgreSQL 8.x\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2009-12-28 00:01+0100\nLast-Translator: <usun0v@mail.bg>\nLanguage-Team: <bg@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Bulgarian\nX-Poedit-Country: BULGARIA\n";
     t[2] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[3] = "CallableStatement \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0431\u0435 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0435\u043d\u0430 \u0438 \u0438\u0437\u0445\u043e\u0434\u043d\u0438\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440 {0} \u0431\u0435 \u043e\u0442 \u0442\u0438\u043f {1}, \u043e\u0431\u0430\u0447\u0435 \u0442\u0438\u043f {2} \u0431\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u043d.";
+    t[3] = "CallableStatement функция бе обработена и изходния параметър {0} бе от тип {1}, обаче тип {2} бе използван.";
     t[6] = "Too many update results were returned.";
-    t[7] = "\u0422\u0432\u044a\u0440\u0434\u0435 \u043c\u043d\u043e\u0433\u043e \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438 \u0431\u044f\u0445\u0430 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438 \u043f\u0440\u0438 \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u044f\u0442\u0430.";
+    t[7] = "Твърде много резултати бяха получени при актуализацията.";
     t[10] = "There are no rows in this ResultSet.";
-    t[11] = "\u0412 \u0442\u043e\u0437\u0438 ResultSet \u043d\u044f\u043c\u0430 \u0440\u0435\u0434\u043e\u0432\u0435.";
+    t[11] = "В този ResultSet няма редове.";
     t[14] = "Detail: {0}";
-    t[15] = "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442: {0}";
+    t[15] = "Подробност: {0}";
     t[20] = "Invalid fetch direction constant: {0}.";
-    t[21] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 \u043a\u043e\u043d\u0441\u0442\u0430\u043d\u0442\u0430 \u0437\u0430 fetch \u043f\u043e\u0441\u043e\u043a\u0430\u0442\u0430: {0}.";
+    t[21] = "Невалидна константа за fetch посоката: {0}.";
     t[22] = "No function outputs were registered.";
-    t[23] = "\u0420\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438 \u043e\u0442 \u0444\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 \u043d\u0435 \u0431\u044f\u0445\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0430\u043d\u0438.";
+    t[23] = "Резултати от функцията не бяха регистрирани.";
     t[24] = "The array index is out of range: {0}";
-    t[25] = "\u0418\u043d\u0434\u0435\u043a\u0441\u044a\u0442 \u043d\u0430 \u043c\u0430\u0441\u0438\u0432 \u0435 \u0438\u0437\u0432\u044a\u043d \u043e\u0431\u0445\u0432\u0430\u0442\u0430: {0}";
+    t[25] = "Индексът на масив е извън обхвата: {0}";
     t[26] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[27] = "\u0422\u0438\u043f \u043d\u0430 \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044f\u0432\u0430\u043d\u0435 {0} \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430. \u041f\u0440\u043e\u0432\u0435\u0440\u0435\u0442\u0435 \u0434\u0430\u043b\u0438 \u0441\u0442\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043b\u0438 pg_hba.conf \u0444\u0430\u0439\u043b\u0430, \u0434\u0430 \u0432\u043a\u043b\u044e\u0447\u0432\u0430 IP \u0430\u0434\u0440\u0435\u0441\u0430 \u043d\u0430 \u043a\u043b\u0438\u0435\u043d\u0442\u0430 \u0438\u043b\u0438 \u043f\u043e\u0434\u043c\u0440\u0435\u0436\u0430\u0442\u0430, \u0438 \u0447\u0435 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430 \u0441\u0445\u0435\u043c\u0430 \u0437\u0430 \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044f\u0432\u0430\u043d\u0435, \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430\u043d\u0430 \u043e\u0442 \u0434\u0440\u0430\u0439\u0432\u044a\u0440\u0430.";
+    t[27] = "Тип на удостоверяване {0} не се поддържа. Проверете дали сте конфигурирали pg_hba.conf файла, да включва IP адреса на клиента или подмрежата, и че се използва схема за удостоверяване, поддържана от драйвъра.";
     t[28] = "The server requested password-based authentication, but no password was provided.";
-    t[29] = "\u0421\u044a\u0440\u0432\u044a\u0440\u044a\u0442 \u0438\u0437\u0438\u0441\u043a\u0432\u0430 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u0430\u043d\u0435 \u0441 \u043f\u0430\u0440\u043e\u043b\u0430, \u043d\u043e \u043f\u0430\u0440\u043e\u043b\u0430 \u043d\u0435 \u0431\u0435 \u0432\u044a\u0432\u0435\u0434\u0435\u043d\u0430.";
+    t[29] = "Сървърът изисква идентифициране с парола, но парола не бе въведена.";
     t[40] = "Large Objects may not be used in auto-commit mode.";
-    t[41] = "\u0413\u043e\u043b\u0435\u043c\u0438 \u043e\u0431\u0435\u043a\u0442\u0438 LOB \u043d\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442 \u0432 auto-commit \u043c\u043e\u0434\u0443\u0441.";
+    t[41] = "Големи обекти LOB не могат да се използват в auto-commit модус.";
     t[46] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[47] = "\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f\u0442\u0430 \u0438\u0437\u0438\u0441\u043a\u0432\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438\u0442\u0435 \u0434\u0430 \u0441\u0430 scrollable, \u043d\u043e \u0442\u043e\u0437\u0438 ResultSet \u0435 FORWARD_ONLY.";
+    t[47] = "Операцията изисква резултатите да са scrollable, но този ResultSet е FORWARD_ONLY.";
     t[48] = "Zero bytes may not occur in string parameters.";
-    t[49] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0438\u043c\u0430 \u043d\u0443\u043b\u0430 \u0431\u0430\u0439\u0442\u0430 \u0432 \u043d\u0438\u0437 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0442\u0435.";
+    t[49] = "Не може да има нула байта в низ параметрите.";
     t[50] = "The JVM claims not to support the encoding: {0}";
-    t[51] = "JVM \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0442\u0430\u0437\u0438 \u043a\u043e\u0434\u043e\u0432\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430 \u0437\u0430 \u043c\u043e\u043c\u0435\u043d\u0442\u0430: {0}";
+    t[51] = "JVM не поддържа тази кодова таблица за момента: {0}";
     t[54] = "Your security policy has prevented the connection from being attempted.  You probably need to grant the connect java.net.SocketPermission to the database server host and port that you wish to connect to.";
-    t[55] = "\u0412\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u043d\u0435 \u0431\u0435 \u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u0430, \u043f\u043e\u0440\u0430\u0434\u0438 \u0432\u0430\u0448\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u0441\u0438\u0433\u0443\u0440\u043d\u043e\u0441\u0442. \u041c\u043e\u0436\u0435 \u0431\u0438 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u0435 java.net.SocketPermission \u043f\u0440\u0430\u0432\u0430 \u043d\u0430 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 \u0438 \u043f\u043e\u0440\u0442\u0430 \u0441 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438, \u043a\u044a\u043c \u043a\u043e\u0439\u0442\u043e \u0438\u0441\u043a\u0430\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0441\u0432\u044a\u0440\u0436\u0435\u0442\u0435.";
+    t[55] = "Връзката не бе осъществена, поради вашите настройки за сигурност. Може би трябва да предоставите java.net.SocketPermission права на сървъра и порта с базата данни, към който искате да се свържете.";
     t[62] = "Database connection failed when canceling copy operation";
-    t[63] = "\u041d\u0435\u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u043a\u044a\u043c \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438 \u043f\u0440\u0438 \u043f\u0440\u0435\u043a\u044a\u0441\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435\u0442\u043e";
+    t[63] = "Неосъществена връзка към базата данни при прекъсване на копирането";
     t[78] = "Error loading default settings from driverconfig.properties";
-    t[79] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435 \u043e\u0442 \u0444\u0430\u0439\u043b\u0430 driverconfig.properties";
+    t[79] = "Грешка при зареждане на настройките по подразбиране от файла driverconfig.properties";
     t[82] = "Returning autogenerated keys is not supported.";
-    t[83] = "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u043d\u0438 \u043a\u043b\u044e\u0447\u043e\u0432\u0435 \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430\u0442.";
+    t[83] = "Автоматично генерирани ключове не се поддържат.";
     t[92] = "Unable to find name datatype in the system catalogs.";
-    t[93] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043d\u0430\u043c\u0435\u0440\u0438 \u0438\u043c\u0435\u0442\u043e \u043d\u0430 \u0442\u0438\u043f\u0430 \u0434\u0430\u043d\u043d\u0438 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0437\u0438.";
+    t[93] = "Не може да се намери името на типа данни в системните каталози.";
     t[94] = "Tried to read from inactive copy";
-    t[95] = "\u041e\u043f\u0438\u0442 \u0437\u0430 \u0447\u0435\u0442\u0435\u043d\u0435 \u043f\u0440\u0438 \u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435";
+    t[95] = "Опит за четене при неактивно копиране";
     t[96] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[97] = "ResultSet \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043e\u0431\u043d\u043e\u0432\u044f\u0432\u0430. \u0417\u0430\u044f\u0432\u043a\u0430\u0442\u0430 \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u0449\u0430 \u0442\u043e\u0437\u0438 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0441\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430 \u0441\u0430\u043c\u043e \u0435\u0434\u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430, \u043a\u0430\u043a\u0442\u043e \u0438 \u0432\u0441\u0438\u0447\u043a\u0438 \u043f\u044a\u0440\u0432\u0438\u0447\u043d\u0438 \u043a\u043b\u044e\u0447\u043e\u0432\u0435 \u0432 \u043d\u0435\u044f. \u0417\u0430 \u043f\u043e\u0432\u0435\u0447\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f, \u0432\u0438\u0436\u0442\u0435 \u0440\u0430\u0437\u0434\u0435\u043b 5.6 \u043d\u0430 JDBC 2.1 API Specification.";
+    t[97] = "ResultSet не може да се обновява. Заявката генерираща този резултат трябва да селектира само една таблица, както и всички първични ключове в нея. За повече информация, вижте раздел 5.6 на JDBC 2.1 API Specification.";
     t[98] = "Cannot cast an instance of {0} to type {1}";
-    t[99] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430 \u0438\u043d\u0441\u0442\u0430\u043d\u0446\u0438\u044f \u043d\u0430 {0} \u043a\u044a\u043c \u0442\u0438\u043f {1}";
+    t[99] = "Не може да преобразува инстанция на {0} към тип {1}";
     t[102] = "Requested CopyOut but got {0}";
-    t[103] = "\u0417\u0430\u0434\u0430\u0434\u0435\u043d\u043e CopyOut \u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e {0}";
+    t[103] = "Зададено CopyOut но получено {0}";
     t[106] = "Not implemented: Prepare must be issued using the same connection that started the transaction. currentXid={0}, prepare xid={1}";
-    t[107] = "\u041d\u0435\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u0430 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044f: Prepare \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0438\u0437\u0434\u0430\u0434\u0435\u043d\u043e \u0447\u0440\u0435\u0437 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0441\u044a\u0449\u0430\u0442\u0430 \u0432\u0440\u044a\u0437\u043a\u0430, \u043f\u0440\u0438 \u043a\u043e\u044f\u0442\u043e \u0435 \u0437\u0430\u043f\u043e\u0447\u043d\u0430\u0442\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f\u0442\u0430. currentXid={0}, prepare xid={1}";
+    t[107] = "Невъзможна комбинация: Prepare трябва да бъде издадено чрез използване на същата връзка, при която е започната транзакцията. currentXid={0}, prepare xid={1}";
     t[108] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[109] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0443\u043f\u043e\u0442\u0440\u0435\u0431\u044f\u0432\u0430\u0442 \u043c\u0435\u0442\u043e\u0434\u0438 \u0437\u0430 \u0437\u0430\u044f\u0432\u043a\u0430, \u043a\u043e\u0438\u0442\u043e \u043f\u043e\u043b\u0437\u0432\u0430\u0442 \u043d\u0438\u0437\u043e\u0432\u0435 \u043d\u0430 PreparedStatement.";
+    t[109] = "Не може да се употребяват методи за заявка, които ползват низове на PreparedStatement.";
     t[114] = "Conversion of money failed.";
-    t[115] = "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0432\u0430\u043b\u0443\u0442\u043d\u043e \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430\u043d\u0435.";
+    t[115] = "Неуспешно валутно преобразуване.";
     t[118] = "Tried to obtain lock while already holding it";
-    t[119] = "\u041e\u043f\u0438\u0442 \u0437\u0430 \u043f\u043e\u043b\u0443\u0447\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u0437\u0430\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435/\u0440\u0435\u0437\u0435\u0440\u0432\u0430\u0446\u0438\u044f \u0434\u043e\u043a\u0430\u0442\u043e \u0432\u0435\u0447\u0435 \u0435 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e";
+    t[119] = "Опит за получаване на заключване/резервация докато вече е получено";
     t[120] = "This SQLXML object has not been initialized, so you cannot retrieve data from it.";
-    t[121] = "\u0422\u043e\u0437\u0438 SQLXML \u043e\u0431\u0435\u043a\u0442 \u043d\u0435 \u0435 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d, \u0442\u0430\u043a\u0430 \u0447\u0435 \u043d\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0441\u0435 \u0438\u0437\u0432\u043b\u0438\u0447\u0430\u0442 \u0434\u0430\u043d\u043d\u0438 \u043e\u0442 \u043d\u0435\u0433\u043e.";
+    t[121] = "Този SQLXML обект не е инициализиран, така че не могат да се извличат данни от него.";
     t[122] = "This SQLXML object has already been freed.";
-    t[123] = "\u0422\u043e\u0437\u0438 SQLXML \u043e\u0431\u0435\u043a\u0442 \u0432\u0435\u0447\u0435 \u0435 \u043e\u0441\u0432\u043e\u0431\u043e\u0434\u0435\u043d.";
+    t[123] = "Този SQLXML обект вече е освободен.";
     t[124] = "Invalid stream length {0}.";
-    t[125] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 \u0434\u044a\u043b\u0436\u0438\u043d\u0430 {0} \u043d\u0430 \u043f\u043e\u0442\u043e\u043a\u0430 \u0434\u0430\u043d\u043d\u0438.";
+    t[125] = "Невалидна дължина {0} на потока данни.";
     t[130] = "Position: {0}";
-    t[131] = "\u041f\u043e\u0437\u0438\u0446\u0438\u044f: {0}";
+    t[131] = "Позиция: {0}";
     t[132] = "The server does not support SSL.";
-    t[133] = "\u0421\u044a\u0440\u0432\u044a\u0440\u044a\u0442 \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 SSL.";
+    t[133] = "Сървърът не поддържа SSL.";
     t[134] = "Got {0} error responses to single copy cancel request";
-    t[135] = "\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u0438 {0} \u043e\u0442\u0433\u043e\u0432\u043e\u0440\u0438 \u0437\u0430 \u0433\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0435\u0434\u0438\u043d\u0441\u0442\u0432\u0435\u043d\u043e \u0438\u0441\u043a\u0430\u043d\u0435 \u0434\u0430 \u0441\u0435 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0435 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435\u0442\u043e";
+    t[135] = "Получени {0} отговори за грешка при единствено искане да се прекъсне копирането";
     t[136] = "DataSource has been closed.";
-    t[137] = "\u0418\u0437\u0442\u043e\u0447\u043d\u0438\u043a\u044a\u0442 \u043d\u0430 \u0434\u0430\u043d\u043d\u0438 \u0435 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442.";
+    t[137] = "Източникът на данни е прекъснат.";
     t[138] = "Unable to convert DOMResult SQLXML data to a string.";
-    t[139] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430 DOMResult SQLXML \u0434\u0430\u043d\u043d\u0438 \u0432 \u043d\u0438\u0437.";
+    t[139] = "Не може да преобразува DOMResult SQLXML данни в низ.";
     t[140] = "Failed to initialize LargeObject API";
-    t[141] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u0430 LargeObject API";
+    t[141] = "Не може да инициализира LargeObject API";
     t[144] = "Invalid UUID data.";
-    t[145] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0438 UUID \u0434\u0430\u043d\u043d\u0438.";
+    t[145] = "Невалидни UUID данни.";
     t[148] = "The fastpath function {0} is unknown.";
-    t[149] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 {0} \u0435 \u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430.";
+    t[149] = "Функцията {0} е неизвестна.";
     t[154] = "Connection has been closed.";
-    t[155] = "\u0412\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u0431\u0435 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442\u0430.";
+    t[155] = "Връзката бе прекъсната.";
     t[156] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[157] = "\u0422\u0430\u0437\u0438 \u0437\u0430\u044f\u0432\u043a\u0430 \u043d\u0435 \u0434\u0435\u043a\u043b\u0430\u0440\u0438\u0440\u0430 \u0438\u0437\u0445\u043e\u0434\u0435\u043d \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440. \u041f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 '{' ?= call ... '}' \u0437\u0430 \u0434\u0430 \u0434\u0435\u043a\u043b\u0430\u0440\u0438\u0440\u0430\u0442\u0435 \u0442\u0430\u043a\u044a\u0432.";
+    t[157] = "Тази заявка не декларира изходен параметър. Ползвайте '{' ?= call ... '}' за да декларирате такъв.";
     t[158] = "A connection could not be made using the requested protocol {0}.";
-    t[159] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0438 \u0432\u0440\u044a\u0437\u043a\u0430, \u043f\u043e\u043b\u0437\u0432\u0430\u0439\u043a\u0438 \u0438\u0441\u043a\u0430\u043d\u0438\u044f \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b {0}.";
+    t[159] = "Не може да осъществи връзка, ползвайки искания протокол {0}.";
     t[162] = "The maximum field size must be a value greater than or equal to 0.";
-    t[163] = "\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u043d\u0438\u044f\u0442 \u0440\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 \u043f\u043e\u043b\u0435\u0442\u043e \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043f\u043e-\u0433\u043e\u043b\u044f\u043c\u0430 \u0438\u043b\u0438 \u0440\u0430\u0432\u043d\u0430 \u043d\u0430 0.";
+    t[163] = "Максималният размер на полето трябва да бъде стойност по-голяма или равна на 0.";
     t[166] = "GSS Authentication failed";
-    t[167] = "GSS \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044f\u0432\u0430\u043d\u0435\u0442\u043e \u0431\u0435 \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e";
+    t[167] = "GSS удостоверяването бе неуспешно";
     t[176] = "Unknown XML Result class: {0}";
-    t[177] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043d XML \u0438\u0437\u0445\u043e\u0434\u044f\u0449 \u043a\u043b\u0430\u0441: {0}";
+    t[177] = "Неизвестен XML изходящ клас: {0}";
     t[180] = "Server SQLState: {0}";
-    t[181] = "SQL \u0441\u0442\u0430\u0442\u0443\u0441 \u043d\u0430 \u0441\u044a\u0440\u0432\u044a\u0440\u0430: {0}";
+    t[181] = "SQL статус на сървъра: {0}";
     t[182] = "Unknown Response Type {0}.";
-    t[183] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043d \u0442\u0438\u043f \u043d\u0430 \u043e\u0442\u0433\u043e\u0432\u043e\u0440 {0}.";
+    t[183] = "Неизвестен тип на отговор {0}.";
     t[186] = "Tried to cancel an inactive copy operation";
-    t[187] = "\u041e\u043f\u0438\u0442 \u0437\u0430 \u043f\u0440\u0435\u043a\u044a\u0441\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435";
+    t[187] = "Опит за прекъсване на неактивно копиране";
     t[190] = "This PooledConnection has already been closed.";
-    t[191] = "\u0422\u0430\u0437\u0438 PooledConnection \u0432\u0440\u044a\u0437\u043a\u0430 \u0431\u0435 \u0432\u0435\u0447\u0435 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442\u0430.";
+    t[191] = "Тази PooledConnection връзка бе вече прекъсната.";
     t[200] = "Multiple ResultSets were returned by the query.";
-    t[201] = "\u0417\u0430\u044f\u0432\u043a\u0430\u0442\u0430 \u0432\u044a\u0440\u043d\u0430 \u043d\u044f\u043a\u043e\u043b\u043a\u043e ResultSets.";
+    t[201] = "Заявката върна няколко ResultSets.";
     t[202] = "Finalizing a Connection that was never closed:";
-    t[203] = "\u041f\u0440\u0438\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430, \u043a\u043e\u044f\u0442\u043e \u043d\u0435 \u0431\u0435 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442\u0430:";
+    t[203] = "Приключване на връзка, която не бе прекъсната:";
     t[204] = "Unsupported Types value: {0}";
-    t[205] = "\u041d\u0435\u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0437\u0430 \u0442\u0438\u043f: {0}";
+    t[205] = "Неподдържана стойност за тип: {0}";
     t[206] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[207] = "CallableStatement \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0431\u0435 \u0434\u0435\u043a\u043b\u0430\u0440\u0438\u0440\u0430\u043d\u0430, \u043d\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0435\u043d\u0430 \u043a\u0430\u0442\u043e registerOutParameter(1, <some type>) ";
+    t[207] = "CallableStatement функция бе декларирана, но обработена като registerOutParameter(1, <some type>) ";
     t[208] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[209] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438 \u0438\u043c\u0435\u0442\u043e \u043d\u0430 \u043d\u0435\u0443\u043f\u043e\u043c\u0435\u043d\u0430\u0442\u0430 savepoint.";
+    t[209] = "Не може да определи името на неупомената savepoint.";
     t[220] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[221] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u0442\u0435 \u043f\u0440\u0430\u0432\u0430\u0442\u0430 \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f\u0442\u0430 \u043f\u043e \u0432\u0440\u0435\u043c\u0435 \u043d\u0430 \u043d\u0435\u0439\u043d\u043e\u0442\u043e \u0438\u0437\u0432\u044a\u0440\u0448\u0432\u0430\u043d\u0435.";
+    t[221] = "Не може да променяте правата на транзакцията по време на нейното извършване.";
     t[222] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[223] = "\u041f\u0440\u0435\u043a\u0430\u043b\u0435\u043d\u043e \u0433\u043e\u043b\u044f\u043c\u0430 \u0434\u044a\u043b\u0436\u0438\u043d\u0430 {0} \u043d\u0430 \u0441\u044a\u043e\u0431\u0449\u0435\u043d\u0438\u0435\u0442\u043e. \u0422\u043e\u0432\u0430 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0435 \u043f\u0440\u0438\u0447\u0438\u043d\u0435\u043d\u043e \u043e\u0442 \u043f\u0440\u0435\u043a\u0430\u043b\u0435\u043d\u043e \u0433\u043e\u043b\u044f\u043c\u0430 \u0438\u043b\u0438 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u043d\u043e \u0437\u0430\u0434\u0430\u0434\u0435\u043d\u0430 \u0434\u044a\u043b\u0436\u0438\u043d\u0430 \u043d\u0430 InputStream \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438.";
+    t[223] = "Прекалено голяма дължина {0} на съобщението. Това може да е причинено от прекалено голяма или неправилно зададена дължина на InputStream параметри.";
     t[224] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[225] = "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440\u043d\u0438\u044f\u0442 \u0438\u043d\u0434\u0435\u043a\u0441 \u0435 \u0438\u0437\u0432\u044a\u043d \u043e\u0431\u0445\u0432\u0430\u0442: {0}, \u0431\u0440\u043e\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438: {1}.";
+    t[225] = "Параметърният индекс е извън обхват: {0}, брой параметри: {1}.";
     t[226] = "Transaction isolation level {0} not supported.";
-    t[227] = "\u0418\u0437\u043e\u043b\u0430\u0446\u0438\u043e\u043d\u043d\u043e \u043d\u0438\u0432\u043e \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438\u0442\u0435 {0} \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430.";
+    t[227] = "Изолационно ниво на транзакциите {0} не се поддържа.";
     t[234] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[235] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043e\u0431\u043d\u043e\u0432\u0438 ResultSet, \u043a\u043e\u0433\u0430\u0442\u043e \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430\u043c\u0435 \u043f\u0440\u0435\u0434\u0438 \u043d\u0430\u0447\u0430\u043b\u043e\u0442\u043e \u0438\u043b\u0438 \u0441\u043b\u0435\u0434 \u043a\u0440\u0430\u044f \u043d\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438\u0442\u0435.";
+    t[235] = "Не може да се обнови ResultSet, когато се намираме преди началото или след края на резултатите.";
     t[238] = "tried to call end without corresponding start call. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
-    t[239] = "\u043e\u043f\u0438\u0442\u0430 \u0434\u0430 \u0438\u0437\u0432\u0438\u043a\u0430 end \u0431\u0435\u0437 \u0441\u044a\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0430\u0449\u043e \u0438\u0437\u0432\u0438\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 start. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
+    t[239] = "опита да извика end без съответстващо извикване на start. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
     t[242] = "This SQLXML object has already been initialized, so you cannot manipulate it further.";
-    t[243] = "\u0422\u043e\u0437\u0438 SQLXML \u043e\u0431\u0435\u043a\u0442 \u0432\u0435\u0447\u0435 \u0435 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d \u0438 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043f\u0440\u043e\u043c\u0435\u043d\u0435\u043d.";
+    t[243] = "Този SQLXML обект вече е инициализиран и не може да бъде променен.";
     t[250] = "Conversion to type {0} failed: {1}.";
-    t[251] = "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430\u043d\u0435 \u043a\u044a\u043c \u0442\u0438\u043f {0}: {1}.";
+    t[251] = "Неуспешно преобразуване към тип {0}: {1}.";
     t[252] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[253] = "\u041a\u043b\u0430\u0441\u044a\u0442 SSLSocketFactory \u0432\u0440\u044a\u0449\u0430 {0} \u0438 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0438\u043d\u0441\u0442\u0430\u043d\u0446\u0438\u0438\u0440\u0430\u043d.";
+    t[253] = "Класът SSLSocketFactory връща {0} и не може да бъде инстанцииран.";
     t[254] = "Unable to create SAXResult for SQLXML.";
-    t[255] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0441\u044a\u0437\u0434\u0430\u0434\u0435 SAXResult \u0437\u0430 SQLXML.";
+    t[255] = "Не може да се създаде SAXResult за SQLXML.";
     t[256] = "Interrupted while attempting to connect.";
-    t[257] = "\u041e\u043f\u0438\u0442\u0430 \u0437\u0430 \u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u0431\u0435 \u0441\u0432\u043e\u0435\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442. ";
+    t[257] = "Опита за осъществяване на връзка бе своевременно прекъснат. ";
     t[260] = "Protocol error.  Session setup failed.";
-    t[261] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u0432 \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430. \u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043d\u0430 \u0441\u0435\u0441\u0438\u044f\u0442\u0430.";
+    t[261] = "Грешка в протокола. Неуспешна настройка на сесията.";
     t[264] = "Database connection failed when starting copy";
-    t[265] = "\u041d\u0435\u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u043a\u044a\u043c \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438 \u043f\u0440\u0438 \u0437\u0430\u043f\u043e\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435\u0442\u043e";
+    t[265] = "Неосъществена връзка към базата данни при започване на копирането";
     t[272] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[273] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0438 cancelRowUpdates() \u043c\u0435\u0442\u043e\u0434\u0430, \u043a\u043e\u0433\u0430\u0442\u043e \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430\u043c\u0435 \u043f\u0440\u0438 \u0440\u0435\u0434\u0438\u0446\u0430\u0442\u0430 \u043d\u0430 \u0432\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435.";
+    t[273] = "Не може да се изпълни cancelRowUpdates() метода, когато се намираме при редицата на въвеждане.";
     t[274] = "Unable to bind parameter values for statement.";
-    t[275] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u043e\u0434\u0433\u043e\u0442\u0432\u0438 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0442\u0435 \u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430\u0442\u0430.";
+    t[275] = "Не може да подготви параметрите на командата.";
     t[280] = "A result was returned when none was expected.";
-    t[281] = "\u0411\u0435 \u043f\u043e\u043b\u0443\u0447\u0435\u043d \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442, \u043a\u043e\u0433\u0430\u0442\u043e \u0442\u0430\u043a\u044a\u0432 \u043d\u0435 \u0431\u0435 \u043e\u0447\u0430\u043a\u0432\u0430\u043d.";
+    t[281] = "Бе получен резултат, когато такъв не бе очакван.";
     t[282] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
-    t[283] = "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440\u044a\u0442 standard_conforming_strings \u043f\u0440\u0438 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 \u0431\u0435 \u0434\u043e\u043a\u043b\u0430\u0434\u0432\u0430\u043d \u043a\u0430\u0442\u043e {0}. JDBC \u0434\u0440\u0430\u0439\u0432\u044a\u0440\u0430 \u043e\u0447\u0430\u043a\u0432\u0430 \u0442\u043e\u0437\u0438 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440 \u0434\u0430 \u0431\u044a\u0434\u0435 on \u0438\u043b\u0438 off.";
+    t[283] = "Параметърът standard_conforming_strings при сървъра бе докладван като {0}. JDBC драйвъра очаква този параметър да бъде on или off.";
     t[284] = "Unable to translate data into the desired encoding.";
-    t[285] = "\u041d\u0435\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430\u043d\u0435 \u043d\u0430 \u0434\u0430\u043d\u043d\u0438 \u0432 \u0436\u0435\u043b\u0430\u043d\u043e\u0442\u043e \u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435.";
+    t[285] = "Невъзможно преобразуване на данни в желаното кодиране.";
     t[292] = "PostgreSQL LOBs can only index to: {0}";
-    t[293] = "PostgreSQL \u0438\u043d\u0434\u0435\u043a\u0441\u0438\u0440\u0430 \u0433\u043e\u043b\u0435\u043c\u0438 \u043e\u0431\u0435\u043a\u0442\u0438 LOB \u0441\u0430\u043c\u043e \u0434\u043e: {0}";
+    t[293] = "PostgreSQL индексира големи обекти LOB само до: {0}";
     t[294] = "Provided InputStream failed.";
-    t[295] = "\u0417\u0430\u0434\u0430\u0434\u0435\u043d\u0438\u044f InputStream \u043f\u043e\u0442\u043e\u043a \u0435 \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u0435\u043d.";
+    t[295] = "Зададения InputStream поток е неуспешен.";
     t[296] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
-    t[297] = "\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u0432 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0437\u0430 \u043c\u043e\u043c\u0435\u043d\u0442\u0430. xid={0}, currentXid={1}, state={2}, flags={3}";
+    t[297] = "Транзакция в транзакция не се поддържа за момента. xid={0}, currentXid={1}, state={2}, flags={3}";
     t[304] = "{0} function takes four and only four argument.";
-    t[305] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 {0} \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0438\u0435\u043c\u0435 \u0447\u0435\u0442\u0438\u0440\u0438 \u0438 \u0441\u0430\u043c\u043e \u0447\u0435\u0442\u0438\u0440\u0438 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u0430.";
+    t[305] = "Функцията {0} може да приеме четири и само четири аргумента.";
     t[306] = "{0} function doesn''t take any argument.";
-    t[307] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 {0} \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0438\u0435\u043c\u0430 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u0438.";
+    t[307] = "Функцията {0} не може да приема аргументи.";
     t[310] = "Got CopyOutResponse from server during an active {0}";
-    t[311] = "\u041f\u043e\u043b\u0443\u0447\u0435\u043d CopyOutResponse \u043e\u0442\u0433\u043e\u0432\u043e\u0440 \u043e\u0442 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 \u043f\u0440\u0438 \u0430\u043a\u0442\u0438\u0432\u043d\u043e {0}";
+    t[311] = "Получен CopyOutResponse отговор от сървъра при активно {0}";
     t[322] = "No value specified for parameter {0}.";
-    t[323] = "\u041d\u044f\u043c\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442, \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0430 \u0437\u0430 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440 {0}.";
+    t[323] = "Няма стойност, определена за параметър {0}.";
     t[324] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[325] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 UTF-8 \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u043d\u043e\u0441\u0442: \u043f\u044a\u0440\u0432\u043e\u043d\u0430\u0447\u0430\u043b\u0435\u043d \u0431\u0430\u0439\u0442 \u0435 {0}: {1}";
+    t[325] = "Невалидна UTF-8 последователност: първоначален байт е {0}: {1}";
     t[326] = "Error disabling autocommit";
-    t[327] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0438\u0437\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 autocommit";
+    t[327] = "Грешка при изключване на autocommit";
     t[328] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[329] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 UTF-8 \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u043d\u043e\u0441\u0442: \u0431\u0430\u0439\u0442\u0430 {0} \u043e\u0442 \u0431\u0430\u0439\u0442\u043e\u0432\u0430 \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u043d\u043e\u0441\u0442 {1} \u043d\u0435 \u0435 10xxxxxx: {2}";
+    t[329] = "Невалидна UTF-8 последователност: байта {0} от байтова последователност {1} не е 10xxxxxx: {2}";
     t[330] = "Received CommandComplete ''{0}'' without an active copy operation";
-    t[331] = "\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u043e \u043a\u043e\u043c\u0430\u043d\u0434\u043d\u043e \u0434\u043e\u043f\u044a\u043b\u043d\u0435\u043d\u0438\u0435 ''{0}'' \u0431\u0435\u0437 \u0430\u043a\u0442\u0438\u0432\u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 \u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435";
+    t[331] = "Получено командно допълнение ''{0}'' без активна команда за копиране";
     t[332] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[333] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 UTF-8 \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u043d\u043e\u0441\u0442: \u043a\u0440\u0430\u0439\u043d\u0430\u0442\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0435 \u0438\u0437\u0432\u044a\u043d \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442\u043d\u0438\u0442\u0435 \u0433\u0440\u0430\u043d\u0438\u0446\u0438: {0}";
+    t[333] = "Невалидна UTF-8 последователност: крайната стойност е извън стойностните граници: {0}";
     t[336] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[337] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u0442\u0435 \u0438\u0437\u043e\u043b\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0442\u043e \u043d\u0438\u0432\u043e \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f\u0442\u0430 \u043f\u043e \u0432\u0440\u0435\u043c\u0435 \u043d\u0430 \u043d\u0435\u0439\u043d\u043e\u0442\u043e \u0438\u0437\u0432\u044a\u0440\u0448\u0432\u0430\u043d\u0435.";
+    t[337] = "Не може да променяте изолационното ниво на транзакцията по време на нейното извършване.";
     t[340] = "An unexpected result was returned by a query.";
-    t[341] = "\u0417\u0430\u044f\u0432\u043a\u0430\u0442\u0430 \u0432\u044a\u0440\u043d\u0430 \u043d\u0435\u043e\u0447\u0430\u043a\u0432\u0430\u043d \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442.";
+    t[341] = "Заявката върна неочакван резултат.";
     t[346] = "Conversion of interval failed";
-    t[347] = "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430\u043d\u0435 \u043d\u0430 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b";
+    t[347] = "Неуспешно преобразуване на интервал";
     t[350] = "This ResultSet is closed.";
-    t[351] = "\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u0438\u0442\u0435 \u043f\u043e \u0442\u043e\u0437\u0438 ResultSet \u0441\u0430 \u0431\u0438\u043b\u0438 \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0435\u043d\u0438.";
+    t[351] = "Операциите по този ResultSet са били прекратени.";
     t[352] = "Read from copy failed.";
-    t[353] = "\u0427\u0435\u0442\u0435\u043d\u0435 \u043e\u0442 \u043a\u043e\u043f\u0438\u0435\u0442\u043e \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e.";
+    t[353] = "Четене от копието неуспешно.";
     t[354] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[355] = "\u041d\u0435\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e \u0435 \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435\u0442\u043e \u043d\u0430 \u043a\u043b\u0430\u0441 {0}, \u043e\u0442\u0433\u043e\u0432\u0430\u0440\u044f\u0449 \u0437\u0430 \u0442\u0438\u043f\u0430 \u0434\u0430\u043d\u043d\u0438 {1}";
+    t[355] = "Невъзможно е зареждането на клас {0}, отговарящ за типа данни {1}";
     t[356] = "Failed to convert binary xml data to encoding: {0}.";
-    t[357] = "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430\u043d\u0435 \u043d\u0430 \u0434\u0432\u043e\u0438\u0447\u043d\u0438 XML \u0434\u0430\u043d\u043d\u0438 \u0437\u0430 \u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u0441\u044a\u0433\u043b\u0430\u0441\u043d\u043e: {0}.";
+    t[357] = "Неуспешно преобразуване на двоични XML данни за кодиране съгласно: {0}.";
     t[362] = "Connection attempt timed out.";
-    t[363] = "\u0412\u0440\u0435\u043c\u0435\u0442\u043e \u0437\u0430 \u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u0438\u0437\u0442\u0435\u0447\u0435 (\u0442\u0430\u0439\u043c\u0430\u0443\u0442).";
+    t[363] = "Времето за осъществяване на връзката изтече (таймаут).";
     t[364] = "Expected command status BEGIN, got {0}.";
-    t[365] = "\u041e\u0447\u0430\u043a\u0432\u0430\u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 BEGIN, \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0430 {0}.";
+    t[365] = "Очаквана команда BEGIN, получена {0}.";
     t[366] = "Not implemented: 2nd phase commit must be issued using an idle connection. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
-    t[367] = "\u041d\u0435\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u0430 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044f: \u0432\u0442\u043e\u0440\u0430\u0442\u0430 \u0444\u0430\u0437\u0430 \u043d\u0430 commit \u0437\u0430\u0434\u044a\u043b\u0436\u0438\u0442\u0435\u043b\u043d\u043e \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0438\u0437\u0434\u0430\u0434\u0435\u043d\u0430 \u043f\u0440\u0438 \u0441\u0432\u043e\u0431\u043e\u0434\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
+    t[367] = "Невъзможна комбинация: втората фаза на commit задължително трябва да бъде издадена при свободна връзка. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
     t[372] = "This copy stream is closed.";
-    t[373] = "\u041f\u043e\u0442\u043e\u043a\u0430 \u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0434\u0430\u043d\u043d\u0438\u0442\u0435 \u0435 \u0437\u0430\u0442\u0432\u043e\u0440\u0435\u043d.";
+    t[373] = "Потока за копиране на данните е затворен.";
     t[376] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[377] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438 SQL \u0442\u0438\u043f, \u043a\u043e\u0439\u0442\u043e \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430 \u0437\u0430 \u0438\u043d\u0441\u0442\u0430\u043d\u0446\u0438\u044f\u0442\u0430 \u043d\u0430 {0}. \u041f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u043c\u0435\u0442\u043e\u0434\u0430 setObject() \u0441 \u0442\u043e\u0447\u043d\u0438 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442\u0438, \u0437\u0430 \u0434\u0430 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u0435 \u0442\u0438\u043f\u0430.";
+    t[377] = "Не може да се определи SQL тип, който да се използва за инстанцията на {0}. Ползвайте метода setObject() с точни стойности, за да определите типа.";
     t[378] = "Can''t refresh the insert row.";
-    t[379] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043e\u0431\u043d\u043e\u0432\u0438 \u0432\u044a\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0440\u0435\u0434.";
+    t[379] = "Не може да обнови въведения ред.";
     t[382] = "You must specify at least one column value to insert a row.";
-    t[383] = "\u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u043f\u043e\u0441\u043e\u0447\u0438\u0442\u0435 \u043f\u043e\u043d\u0435 \u0435\u0434\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0437\u0430 \u043a\u043e\u043b\u043e\u043d\u0430, \u0437\u0430 \u0434\u0430 \u0432\u043c\u044a\u043a\u043d\u0435\u0442\u0435 \u0440\u0435\u0434.";
+    t[383] = "Трябва да посочите поне една стойност за колона, за да вмъкнете ред.";
     t[388] = "Connection is busy with another transaction";
-    t[389] = "\u0412\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u0435 \u0437\u0430\u0435\u0442\u0430 \u0441 \u0434\u0440\u0443\u0433\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f";
+    t[389] = "Връзката е заета с друга транзакция";
     t[392] = "Bad value for type {0} : {1}";
-    t[393] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0437\u0430 \u0442\u0438\u043f {0} : {1}";
+    t[393] = "Невалидна стойност за тип {0} : {1}";
     t[396] = "This statement has been closed.";
-    t[397] = "\u041a\u043e\u043c\u0430\u043d\u0434\u0430\u0442\u0430 \u0435 \u0438\u0437\u0432\u044a\u0440\u0448\u0435\u043d\u0430.";
+    t[397] = "Командата е извършена.";
     t[404] = "No primary key found for table {0}.";
-    t[405] = "\u041d\u044f\u043c\u0430 \u043f\u044a\u0440\u0432\u0438\u0447\u0435\u043d \u043a\u043b\u044e\u0447 \u0437\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430 {0}.";
+    t[405] = "Няма първичен ключ за таблица {0}.";
     t[406] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[407] = "\u0412 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430\u043c\u0435 \u043f\u0440\u0435\u0434\u0438 \u043a\u0440\u0430\u044f \u043d\u0430 ResultSet. \u0422\u0443\u043a \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0438 deleteRow() \u043c\u0435\u0442\u043e\u0434\u0430.";
+    t[407] = "В момента се намираме преди края на ResultSet. Тук не може да се изпълни deleteRow() метода.";
     t[414] = "{0} function takes two or three arguments.";
-    t[415] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 {0} \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0438\u0435\u043c\u0435 \u0434\u0432\u0430 \u0438\u043b\u0438 \u0442\u0440\u0438 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u0430.";
+    t[415] = "Функцията {0} може да приеме два или три аргумента.";
     t[416] = "{0} function takes three and only three arguments.";
-    t[417] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 {0} \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0438\u0435\u043c\u0435 \u0442\u0440\u0438 \u0438 \u0441\u0430\u043c\u043e \u0442\u0440\u0438 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u0430.";
+    t[417] = "Функцията {0} може да приеме три и само три аргумента.";
     t[418] = "Unable to find server array type for provided name {0}.";
-    t[419] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043d\u0430\u043c\u0435\u0440\u0438 \u0442\u0438\u043f\u0430 \u043d\u0430 \u0441\u044a\u0440\u0432\u044a\u0440\u0435\u043d \u043c\u0430\u0441\u0438\u0432 \u0437\u0430 \u0437\u0430\u0434\u0430\u0434\u0435\u043d\u043e\u0442\u043e \u0438\u043c\u0435 {0}.";
+    t[419] = "Не може да се намери типа на сървърен масив за зададеното име {0}.";
     t[420] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[421] = "\u0418\u0437\u0432\u0438\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 {0} - \u043d\u044f\u043c\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438 \u0438 \u0430 \u0431\u0435 \u043e\u0447\u0430\u043a\u0432\u0430\u043d\u043e \u0446\u044f\u043b\u043e \u0447\u0438\u0441\u043b\u043e.";
+    t[421] = "Извикване на {0} - няма резултати и а бе очаквано цяло число.";
     t[426] = "Database connection failed when ending copy";
-    t[427] = "\u041d\u0435\u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u043a\u044a\u043c \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438 \u043f\u0440\u0438 \u0437\u0430\u0432\u044a\u0440\u0448\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435\u0442\u043e";
+    t[427] = "Неосъществена връзка към базата данни при завършване на копирането";
     t[428] = "Cannot write to copy a byte of value {0}";
-    t[429] = "\u041d\u044f\u043c\u0430 \u043f\u0438\u0448\u0435\u0449\u0438 \u043f\u0440\u0430\u0432\u0430, \u0437\u0430 \u0434\u0430 \u043a\u043e\u043f\u0438\u0440\u0430 \u0431\u0430\u0439\u0442\u043e\u0432\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 {0}";
+    t[429] = "Няма пишещи права, за да копира байтова стойност {0}";
     t[430] = "Results cannot be retrieved from a CallableStatement before it is executed.";
-    t[431] = "\u0420\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438 \u043e\u0442 CallableStatement \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u043d\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438, \u043f\u0440\u0435\u0434\u0438 \u0442\u044f \u0434\u0430 \u0431\u044a\u0434\u0435 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0435\u043d\u0430.";
+    t[431] = "Резултати от CallableStatement функция не могат да бъдат получени, преди тя да бъде обработена.";
     t[432] = "Cannot reference a savepoint after it has been released.";
-    t[433] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0440\u0435\u0444\u0435\u0440\u0435\u043d\u0446\u0438\u0440\u0430 savepoint, \u0441\u043b\u0435\u0434 \u043a\u0430\u0442\u043e \u0435 \u0431\u0438\u043b\u0430 \u043e\u0441\u0432\u043e\u0431\u043e\u0434\u0435\u043d\u0430.";
+    t[433] = "Не може да референцира savepoint, след като е била освободена.";
     t[434] = "Failed to create object for: {0}.";
-    t[435] = "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u044a\u0437\u0434\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0431\u0435\u043a\u0442 \u0437\u0430: {0}.";
+    t[435] = "Неуспешно създаване на обект за: {0}.";
     t[438] = "Unexpected packet type during copy: {0}";
-    t[439] = "\u041d\u0435\u043e\u0447\u0430\u043a\u0432\u0430\u043d \u0442\u0438\u043f \u043f\u0430\u043a\u0435\u0442 \u043f\u0440\u0438 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435: {0}";
+    t[439] = "Неочакван тип пакет при копиране: {0}";
     t[442] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[443] = "\u041d\u0435\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e \u0435 \u0434\u0430 \u0441\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442\u0442\u0430 \u0437\u0430 MaxIndexKeys \u043f\u043e\u0440\u0430\u0434\u0438 \u043b\u0438\u043f\u0441\u0430 \u043d\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0438\u044f \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0441 \u0434\u0430\u043d\u043d\u0438.";
+    t[443] = "Невъзможно е да се определи стойността за MaxIndexKeys поради липса на системния каталог с данни.";
     t[444] = "Tried to end inactive copy";
-    t[445] = "\u041e\u043f\u0438\u0442 \u0437\u0430 \u043f\u0440\u0435\u043a\u044a\u0441\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435";
+    t[445] = "Опит за прекъсване на неактивно копиране";
     t[450] = "Unexpected copydata from server for {0}";
-    t[451] = "\u041d\u0435\u043e\u0447\u0430\u043a\u0432\u0430\u043d\u043e CopyData \u043e\u0442 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 \u0437\u0430 {0}";
+    t[451] = "Неочаквано CopyData от сървъра за {0}";
     t[460] = "Zero bytes may not occur in identifiers.";
-    t[461] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0438\u043c\u0430 \u043d\u0443\u043b\u0430 \u0431\u0430\u0439\u0442\u0430 \u0432 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0438\u0442\u0435.";
+    t[461] = "Не може да има нула байта в идентификаторите.";
     t[462] = "Error during one-phase commit. commit xid={0}";
-    t[463] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0435\u0434\u043d\u043e-\u0444\u0430\u0437\u043e\u0432 commit. commit xid={0}";
+    t[463] = "Грешка при едно-фазов commit. commit xid={0}";
     t[464] = "Ran out of memory retrieving query results.";
-    t[465] = "\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u044a\u0447\u043d\u0430 \u043f\u0430\u043c\u0435\u0442 \u043f\u0440\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044f\u043d\u0430 \u043d\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438\u0442\u0435 \u043e\u0442 \u0437\u0430\u044f\u0432\u043a\u0430\u0442\u0430.";
+    t[465] = "Недостатъчна памет при представяна на резултатите от заявката.";
     t[468] = "Unable to create StAXResult for SQLXML";
-    t[469] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0441\u044a\u0437\u0434\u0430\u0434\u0435 StAXResult \u0437\u0430 SQLXML.";
+    t[469] = "Не може да се създаде StAXResult за SQLXML.";
     t[470] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[471] = "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435: \u0424\u0430\u0439\u043b: {0}, \u0424\u0443\u043d\u043a\u0446\u0438\u044f: {1}, \u0420\u0435\u0434: {2}";
+    t[471] = "Местоположение: Файл: {0}, Функция: {1}, Ред: {2}";
     t[482] = "A CallableStatement was executed with an invalid number of parameters";
-    t[483] = "CallableStatement \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0431\u0435 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0435\u043d\u0430, \u043d\u043e \u0441 \u043d\u0435\u043f\u043e\u0437\u0432\u043e\u043b\u0435\u043d \u0431\u0440\u043e\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438.";
+    t[483] = "CallableStatement функция бе обработена, но с непозволен брой параметри.";
     t[486] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
-    t[487] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 UTF-8 \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u043d\u043e\u0441\u0442: {0} \u0431\u0430\u0439\u0442\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0438 \u0437\u0430 \u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435\u0442\u043e \u043d\u0430 {1} \u0431\u0430\u0439\u0442\u043e\u0432\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442: {2}";
+    t[487] = "Невалидна UTF-8 последователност: {0} байта използвани за кодирането на {1} байтова стойност: {2}";
     t[496] = "Interrupted while waiting to obtain lock on database connection";
-    t[497] = "\u041f\u0440\u0435\u043a\u044a\u0441\u0432\u0430\u043d\u0435 \u043f\u0440\u0438 \u0447\u0430\u043a\u0430\u043d\u0435 \u0434\u0430 \u043f\u043e\u043b\u0443\u0447\u0438 \u0437\u0430\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435/\u0440\u0435\u0437\u0435\u0440\u0432\u0430\u0446\u0438\u044f \u043f\u0440\u0438 \u0432\u0440\u044a\u0437\u043a\u0430 \u043a\u044a\u043c \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438";
+    t[497] = "Прекъсване при чакане да получи заключване/резервация при връзка към базата данни";
     t[502] = "LOB positioning offsets start at 1.";
-    t[503] = "\u041f\u043e\u0437\u0438\u0446\u0438\u043e\u043d\u0430\u043b\u043d\u0438\u044f\u0442 \u043e\u0444\u0441\u0435\u0442 \u043f\u0440\u0438 \u0433\u043e\u043b\u0435\u043c\u0438 \u043e\u0431\u0435\u043a\u0442\u0438 LOB \u0437\u0430\u043f\u043e\u0447\u0432\u0430 \u043e\u0442 1.";
+    t[503] = "Позиционалният офсет при големи обекти LOB започва от 1.";
     t[506] = "Returning autogenerated keys by column index is not supported.";
-    t[507] = "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u043d\u0438 \u043a\u043b\u044e\u0447\u043e\u0432\u0435 \u0441\u043f\u0440\u044f\u043c\u043e \u0438\u043d\u0434\u0435\u043a\u0441 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430\u0442.";
+    t[507] = "Автоматично генерирани ключове спрямо индекс на колона не се поддържат.";
     t[510] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[511] = "\u0412 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430\u043c\u0435 \u0432 \u043d\u0430\u0447\u0430\u043b\u043e\u0442\u043e \u043d\u0430 ResultSet. \u0422\u0443\u043a \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0438 deleteRow() \u043c\u0435\u0442\u043e\u0434\u0430.";
+    t[511] = "В момента се намираме в началото на ResultSet. Тук не може да се изпълни deleteRow() метода.";
     t[524] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[525] = "\u0421\u043a\u044a\u0441\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0433\u043e\u043b\u0435\u043c\u0438 \u043e\u0431\u0435\u043a\u0442\u0438 LOB \u0435 \u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u043e \u0441\u0430\u043c\u043e \u0432\u044a\u0432 \u0432\u0435\u0440\u0441\u0438\u0438 \u0441\u043b\u0435\u0434 8.3.";
+    t[525] = "Скъсяване на големи обекти LOB е осъществено само във версии след 8.3.";
     t[526] = "Statement has been closed.";
-    t[527] = "\u041a\u043e\u043c\u0430\u043d\u0434\u0430\u0442\u0430 \u0435 \u0437\u0430\u0432\u044a\u0440\u0448\u0435\u043d\u0430.";
+    t[527] = "Командата е завършена.";
     t[540] = "Database connection failed when writing to copy";
-    t[541] = "\u041d\u0435\u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u043a\u044a\u043c \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438 \u043f\u0440\u0438 \u043e\u043f\u0438\u0442 \u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435";
+    t[541] = "Неосъществена връзка към базата данни при опит за копиране";
     t[544] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[545] = "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440\u044a\u0442 DateStyle \u043f\u0440\u0438 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 \u0431\u0435 \u043f\u0440\u043e\u043c\u0435\u043d\u0435\u043d \u043d\u0430 {0}. JDBC \u0434\u0440\u0430\u0439\u0432\u044a\u0440\u0430 \u0438\u0437\u0438\u0441\u043a\u0432\u0430 DateStyle \u0437\u0430\u043f\u043e\u0447\u0432\u0430 \u0441 ISO \u0437\u0430 \u0434\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0438\u0440\u0430 \u043f\u0440\u0430\u0432\u0438\u043b\u043d\u043e.";
+    t[545] = "Параметърът DateStyle при сървъра бе променен на {0}. JDBC драйвъра изисква DateStyle започва с ISO за да функционира правилно.";
     t[546] = "Provided Reader failed.";
-    t[547] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u0441 \u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0438\u044f \u0447\u0435\u0442\u0435\u0446.";
+    t[547] = "Грешка с ползвания четец.";
     t[550] = "Not on the insert row.";
-    t[551] = "\u041d\u0435 \u0441\u043c\u0435 \u0432 \u0440\u0435\u0434\u0438\u0446\u0430\u0442\u0430 \u043d\u0430 \u0432\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435.";
+    t[551] = "Не сме в редицата на въвеждане.";
     t[566] = "Unable to decode xml data.";
-    t[567] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430 XML \u0434\u0430\u043d\u043d\u0438\u0442\u0435.";
+    t[567] = "Не може да декодира XML данните.";
     t[596] = "Tried to write to an inactive copy operation";
-    t[597] = "\u041e\u043f\u0438\u0442 \u0437\u0430 \u043f\u0438\u0441\u0430\u043d\u0435 \u043f\u0440\u0438 \u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u0430 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435";
+    t[597] = "Опит за писане при неактивна операция за копиране";
     t[606] = "An error occurred while setting up the SSL connection.";
-    t[607] = "\u0412\u044a\u0437\u043d\u0438\u043a\u043d\u0430 \u0433\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 SSL \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430.";
+    t[607] = "Възникна грешка при осъществяване на SSL връзката.";
     t[614] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[615] = "\u0412\u044a\u0437\u043d\u0438\u043a\u043d\u0430 \u043d\u0435\u043e\u0447\u0430\u043a\u0432\u0430\u043d\u0430 \u0433\u0440\u0435\u0448\u043a\u0430 \u0441 \u0434\u0440\u0430\u0439\u0432\u044a\u0440\u0430. \u041c\u043e\u043b\u044f \u0434\u043e\u043a\u0430\u0434\u0432\u0430\u0439\u0442\u0435 \u0442\u043e\u0432\u0430 \u0438\u0437\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435. ";
+    t[615] = "Възникна неочаквана грешка с драйвъра. Моля докадвайте това изключение. ";
     t[618] = "No results were returned by the query.";
-    t[619] = "\u041d\u044f\u043c\u0430 \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u0438 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438 \u0437\u0430 \u0437\u0430\u044f\u0432\u043a\u0430\u0442\u0430.";
+    t[619] = "Няма намерени резултати за заявката.";
     t[620] = "ClientInfo property not supported.";
-    t[621] = "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f\u0442\u0430 \u0437\u0430 ClientInfo \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430.";
+    t[621] = "Информацията за ClientInfo не се поддържа.";
     t[622] = "Unexpected error writing large object to database.";
-    t[623] = "\u041d\u0435\u043e\u0447\u0430\u043a\u0432\u0430\u043d\u0430 \u0433\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0437\u0430\u043f\u0438\u0441\u0432\u0430\u043d\u0435 \u043d\u0430 \u0433\u043e\u043b\u044f\u043c \u043e\u0431\u0435\u043a\u0442 LOB \u0432 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438.";
+    t[623] = "Неочаквана грешка при записване на голям обект LOB в базата данни.";
     t[628] = "The JVM claims not to support the {0} encoding.";
-    t[629] = "JVM \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0437\u0430 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 {0} \u043a\u043e\u0434\u043e\u0432\u0430\u0442\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430.";
+    t[629] = "JVM не поддържа за момента {0} кодовата таблица.";
     t[630] = "Unknown XML Source class: {0}";
-    t[631] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043d XML \u0432\u0445\u043e\u0434\u044f\u0449 \u043a\u043b\u0430\u0441: {0}";
+    t[631] = "Неизвестен XML входящ клас: {0}";
     t[632] = "Interval {0} not yet implemented";
-    t[633] = "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u044a\u0442 {0} \u043d\u0435 \u0435 \u0432\u0430\u043b\u0438\u0434\u0435\u043d \u0432\u0441\u0435 \u043e\u0449\u0435.";
+    t[633] = "Интервалът {0} не е валиден все още.";
     t[636] = "commit called before end. commit xid={0}, state={1}";
-    t[637] = "commit \u0438\u0437\u0432\u0438\u043a\u0430\u043d \u043f\u0440\u0435\u0434\u0438 end. commit xid={0}, state={1}";
+    t[637] = "commit извикан преди end. commit xid={0}, state={1}";
     t[638] = "Tried to break lock on database connection";
-    t[639] = "\u041e\u043f\u0438\u0442 \u0437\u0430 \u043f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0437\u0430\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435\u0442\u043e/\u0440\u0435\u0437\u0435\u0440\u0432\u0430\u0446\u0438\u044f\u0442\u0430 \u043f\u0440\u0438 \u0432\u0440\u044a\u0437\u043a\u0430 \u043a\u044a\u043c \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438";
+    t[639] = "Опит за премахване на заключването/резервацията при връзка към базата данни";
     t[642] = "Missing expected error response to copy cancel request";
-    t[643] = "\u041b\u0438\u043f\u0441\u0432\u0430 \u043e\u0447\u0430\u043a\u0432\u0430\u043d \u043e\u0442\u0433\u043e\u0432\u043e\u0440 \u043f\u0440\u0438 \u0433\u0440\u0435\u0448\u043a\u0430 \u0434\u0430 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0435 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435\u0442\u043e";
+    t[643] = "Липсва очакван отговор при грешка да прекъсне копирането";
     t[644] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[645] = "\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u043d\u0438\u044f\u0442 \u0431\u0440\u043e\u0439 \u0440\u0435\u0434\u043e\u0432\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043f\u043e-\u0433\u043e\u043b\u044f\u043c\u0430 \u0438\u043b\u0438 \u0440\u0430\u0432\u043d\u0430 \u043d\u0430 0.";
+    t[645] = "Максималният брой редове трябва да бъде стойност по-голяма или равна на 0.";
     t[652] = "Requested CopyIn but got {0}";
-    t[653] = "\u0417\u0430\u0434\u0430\u0434\u0435\u043d\u043e CopyIn \u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e {0}";
+    t[653] = "Зададено CopyIn но получено {0}";
     t[656] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[657] = "\u041e\u0442\u0447\u0435\u0442\u0435\u043d \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440 \u043e\u0442 \u0442\u0438\u043f {0}, \u043d\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0435\u043d\u043e \u043a\u0430\u0442\u043e get{1} (sqltype={2}). ";
+    t[657] = "Отчетен параметър от тип {0}, но обработено като get{1} (sqltype={2}). ";
     t[662] = "Unsupported value for stringtype parameter: {0}";
-    t[663] = "\u041d\u0435\u043f\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0437\u0430 StringType \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440: {0}";
+    t[663] = "Непозволена стойност за StringType параметър: {0}";
     t[664] = "Fetch size must be a value greater to or equal to 0.";
-    t[665] = "\u0420\u0430\u0437\u043c\u0435\u0440\u0430 \u0437\u0430 fetch size \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043f\u043e-\u0433\u043e\u043b\u044f\u043c \u0438\u043b\u0438 \u0440\u0430\u0432\u0435\u043d \u043d\u0430 0.";
+    t[665] = "Размера за fetch size трябва да бъде по-голям или равен на 0.";
     t[670] = "Cannot tell if path is open or closed: {0}.";
-    t[671] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438 \u0434\u0430\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u0435 \u043e\u0442\u0432\u043e\u0440\u0435\u043d \u0438\u043b\u0438 \u0437\u0430\u0442\u0432\u043e\u0440\u0435\u043d: {0}.";
+    t[671] = "Не може да определи дали адреса е отворен или затворен: {0}.";
     t[672] = "Expected an EOF from server, got: {0}";
-    t[673] = "\u041e\u0447\u0430\u043a\u0432\u0430\u043d \u043a\u0440\u0430\u0439 \u043d\u0430 \u0444\u0430\u0439\u043b\u0430 \u043e\u0442 \u0441\u044a\u0440\u0432\u044a\u0440\u0430, \u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e: {0}";
+    t[673] = "Очакван край на файла от сървъра, но получено: {0}";
     t[680] = "Copying from database failed: {0}";
-    t[681] = "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435\u0442\u043e \u043e\u0442 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438 \u0431\u0435 \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e: {0}";
+    t[681] = "Копирането от базата данни бе неуспешно: {0}";
     t[682] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[683] = "\u0412\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u0431\u0435 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442\u0430, \u0437\u0430\u0449\u043e\u0442\u043e \u043d\u043e\u0432\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u0437\u0430 \u0441\u044a\u0449\u0430\u0442\u0430 \u0431\u0435\u0448\u0435 \u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u0430 \u0438\u043b\u0438 PooledConnection \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u0435 \u0432\u0435\u0447\u0435 \u043f\u0440\u0435\u043a\u044a\u0441\u043d\u0430\u0442\u0430.";
+    t[683] = "Връзката бе автоматично прекъсната, защото нова връзка за същата беше осъществена или PooledConnection връзката е вече прекъсната.";
     t[698] = "Custom type maps are not supported.";
-    t[699] = "\u0421\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u0438 \u0442\u0438\u043f\u043e\u0432\u0438 \u0441\u044a\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u044f \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430\u0442.";
+    t[699] = "Специфични типови съответствия не се поддържат.";
     t[700] = "xid must not be null";
-    t[701] = "xid \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0431\u044a\u0434\u0435 null";
+    t[701] = "xid не може да бъде null";
     t[706] = "Internal Position: {0}";
-    t[707] = "\u0412\u044a\u0442\u0440\u0435\u0448\u043d\u0430 \u043f\u043e\u0437\u0438\u0446\u0438\u044f: {0}";
+    t[707] = "Вътрешна позиция: {0}";
     t[708] = "Error during recover";
-    t[709] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0432\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435";
+    t[709] = "Грешка при възстановяване";
     t[712] = "Method {0} is not yet implemented.";
-    t[713] = "\u041c\u0435\u0442\u043e\u0434\u044a\u0442 {0} \u0432\u0441\u0435 \u043e\u0449\u0435 \u043d\u0435 \u0435 \u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u0435\u043d.";
+    t[713] = "Методът {0} все още не е функционален.";
     t[714] = "Unexpected command status: {0}.";
-    t[715] = "\u041d\u0435\u043e\u0447\u0430\u043a\u0432\u0430\u043d \u0441\u0442\u0430\u0442\u0443\u0441 \u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430: {0}.";
+    t[715] = "Неочакван статус на команда: {0}.";
     t[718] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[719] = "\u0418\u043d\u0434\u0435\u043a\u0441\u044a\u0442 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430 \u0435 \u0438\u0437\u0432\u044a\u043d \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442\u0435\u043d \u043e\u0431\u0445\u0432\u0430\u0442: {0}, \u0431\u0440\u043e\u0439 \u043a\u043e\u043b\u043e\u043d\u0438: {1}.";
+    t[719] = "Индексът на колоната е извън стойностен обхват: {0}, брой колони: {1}.";
     t[730] = "Unknown ResultSet holdability setting: {0}.";
-    t[731] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430 ResultSet holdability \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430: {0}.";
+    t[731] = "Неизвестна ResultSet holdability настройка: {0}.";
     t[734] = "Cannot call deleteRow() when on the insert row.";
-    t[735] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0438 deleteRow() \u043c\u0435\u0442\u043e\u0434\u0430, \u043a\u043e\u0433\u0430\u0442\u043e \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430\u043c\u0435 \u043f\u0440\u0438 \u0440\u0435\u0434\u0438\u0446\u0430\u0442\u0430 \u043d\u0430 \u0432\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435.";
+    t[735] = "Не може да се изпълни deleteRow() метода, когато се намираме при редицата на въвеждане.";
     t[740] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[741] = "ResultSet \u043d\u0435 \u0435 \u0440\u0435\u0444\u0435\u0440\u0435\u043d\u0446\u0438\u0440\u0430\u043d \u043f\u0440\u0430\u0432\u0438\u043b\u043d\u043e. \u0412\u0435\u0440\u043e\u044f\u0442\u043d\u043e \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u043f\u0440\u0438\u0434\u0432\u0438\u0436\u0438\u0442\u0435 \u043a\u0443\u0440\u0441\u043e\u0440\u0430 \u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u043e\u043c next.";
+    t[741] = "ResultSet не е референциран правилно. Вероятно трябва да придвижите курсора посредством next.";
     t[742] = "wasNull cannot be call before fetching a result.";
-    t[743] = "wasNull \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0431\u044c\u0434\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0435\u043d, \u043f\u0440\u0435\u0434\u0438 \u043d\u0430\u043b\u0438\u0447\u0438\u0435\u0442\u043e \u043d\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0430.";
+    t[743] = "wasNull не може да бьде изпълнен, преди наличието на резултата.";
     t[746] = "{0} function takes two and only two arguments.";
-    t[747] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 {0} \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0438\u0435\u043c\u0435 \u0434\u0432\u0430 \u0438 \u0441\u0430\u043c\u043e \u0434\u0432\u0430 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u0430.";
+    t[747] = "Функцията {0} може да приеме два и само два аргумента.";
     t[750] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[751] = "\u041d\u0435\u043f\u043e\u0437\u0432\u043e\u043b\u0435\u043d \u0441\u0438\u043d\u0442\u0430\u043a\u0441\u0438\u0441 \u043d\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0438\u043b\u0438 \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u0430 \u043f\u0440\u0438 \u043e\u0444\u0441\u0435\u0442 {0}.";
+    t[751] = "Непозволен синтаксис на функция или процедура при офсет {0}.";
     t[752] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[753] = "\u041f\u0440\u0435\u0436\u0434\u0435\u0432\u0440\u0435\u043c\u0435\u043d\u0435\u043d \u043a\u0440\u0430\u0439 \u043d\u0430 \u0432\u0445\u043e\u0434\u044f\u0449 \u043f\u043e\u0442\u043e\u043a \u043d\u0430 \u0434\u0430\u043d\u043d\u0438, \u043e\u0447\u0430\u043a\u0432\u0430\u043d\u0438 {0} \u0431\u0430\u0439\u0442\u0430, \u043d\u043e \u043f\u0440\u043e\u0447\u0435\u0442\u0435\u043d\u0438 \u0441\u0430\u043c\u043e {1}.";
+    t[753] = "Преждевременен край на входящ поток на данни, очаквани {0} байта, но прочетени само {1}.";
     t[756] = "Got CopyData without an active copy operation";
-    t[757] = "\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u043e CopyData \u0431\u0435\u0437 \u043d\u0430\u043b\u0438\u0447\u0438\u0435 \u043d\u0430 \u0430\u043a\u0442\u0438\u0432\u043d\u0430 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435";
+    t[757] = "Получено CopyData без наличие на активна операция за копиране";
     t[758] = "Cannot retrieve the id of a named savepoint.";
-    t[759] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438 ID \u043d\u0430 \u0441\u043f\u043e\u043c\u0435\u043d\u0430\u0442\u0430 savepoint.";
+    t[759] = "Не може да определи ID на спомената savepoint.";
     t[770] = "Where: {0}";
-    t[771] = "\u041a\u044a\u0434\u0435\u0442\u043e: {0}";
+    t[771] = "Където: {0}";
     t[778] = "Got CopyInResponse from server during an active {0}";
-    t[779] = "\u041f\u043e\u043b\u0443\u0447\u0435\u043d CopyInResponse \u043e\u0442\u0433\u043e\u0432\u043e\u0440 \u043e\u0442 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 \u043f\u0440\u0438 \u0430\u043a\u0442\u0438\u0432\u043d\u043e {0}";
+    t[779] = "Получен CopyInResponse отговор от сървъра при активно {0}";
     t[780] = "Cannot convert an instance of {0} to type {1}";
-    t[781] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u0443\u0432\u0430 \u0438\u043d\u0441\u0442\u0430\u043d\u0446\u0438\u044f\u0442\u0430 \u043d\u0430 {0} \u0432\u044a\u0432 \u0432\u0438\u0434\u0430 {1}";
+    t[781] = "Не може да преобразува инстанцията на {0} във вида {1}";
     t[784] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
-    t[785] = "\u041d\u0435\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u0430 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044f: \u0435\u0434\u043d\u043e-\u0444\u0430\u0437\u043e\u0432 commit \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0438\u0437\u0434\u0430\u0434\u0435\u043d \u0447\u0440\u0435\u0437 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0441\u044a\u0449\u0430\u0442\u0430 \u0432\u0440\u044a\u0437\u043a\u0430, \u043f\u0440\u0438 \u043a\u043e\u044f\u0442\u043e \u0435 \u0437\u0430\u043f\u043e\u0447\u043d\u0430\u043b";
+    t[785] = "Невъзможна комбинация: едно-фазов commit трябва да бъде издаден чрез използване на същата връзка, при която е започнал";
     t[790] = "Invalid flags {0}";
-    t[791] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0438 \u0444\u043b\u0430\u0433\u043e\u0432\u0435 {0}";
+    t[791] = "Невалидни флагове {0}";
     t[798] = "Query timeout must be a value greater than or equals to 0.";
-    t[799] = "\u0412\u0440\u0435\u043c\u0435\u0442\u043e \u0437\u0430 \u0438\u0437\u043f\u044a\u043b\u043d\u0435\u043d\u0438\u0435 \u043d\u0430 \u0437\u0430\u044f\u0432\u043a\u0430\u0442\u0430 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043f\u043e-\u0433\u043e\u043b\u044f\u043c\u0430 \u0438\u043b\u0438 \u0440\u0430\u0432\u043d\u0430 \u043d\u0430 0.";
+    t[799] = "Времето за изпълнение на заявката трябва да бъде стойност по-голяма или равна на 0.";
     t[802] = "Hint: {0}";
-    t[803] = "\u0417\u0430\u0431\u0435\u043b\u0435\u0436\u043a\u0430: {0}";
+    t[803] = "Забележка: {0}";
     t[810] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[811] = "\u0418\u043d\u0434\u0435\u043a\u0441\u044a\u0442 \u043d\u0430 \u043c\u0430\u0441\u0438\u0432 \u0435 \u0438\u0437\u0432\u044a\u043d \u043e\u0431\u0445\u0432\u0430\u0442\u0430: {0}, \u0431\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438: {1}.";
+    t[811] = "Индексът на масив е извън обхвата: {0}, брой елементи: {1}.";
     t[812] = "Internal Query: {0}";
-    t[813] = "\u0412\u044a\u0442\u0440\u0435\u0448\u043d\u0430 \u0437\u0430\u044f\u0432\u043a\u0430: {0}";
+    t[813] = "Вътрешна заявка: {0}";
     t[816] = "CommandComplete expected COPY but got: ";
-    t[817] = "\u041e\u0447\u0430\u043a\u0432\u0430\u043d\u043e \u043a\u043e\u043c\u0430\u043d\u0434\u043d\u043e \u0434\u043e\u043f\u044a\u043b\u043d\u0435\u043d\u0438\u0435 COPY \u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e: ";
+    t[817] = "Очаквано командно допълнение COPY но получено: ";
     t[824] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[825] = "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 UTF-8 \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u043d\u043e\u0441\u0442: \u043a\u0440\u0430\u0439\u043d\u0430\u0442\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0435 \u0437\u0430\u043c\u0435\u0441\u0442\u0438\u0442\u0435\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442: {0}";
+    t[825] = "Невалидна UTF-8 последователност: крайната стойност е заместителна стойност: {0}";
     t[826] = "Unknown type {0}.";
-    t[827] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043d \u0442\u0438\u043f {0}.";
+    t[827] = "Неизвестен тип {0}.";
     t[828] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[829] = "ResultSets \u0441 concurrency CONCUR_READ_ONLY \u043d\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0438.";
+    t[829] = "ResultSets с concurrency CONCUR_READ_ONLY не могат да бъдат актуализирани.";
     t[830] = "The connection attempt failed.";
-    t[831] = "\u041e\u043f\u0438\u0442\u0430 \u0437\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u0431\u0435 \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u0435\u043d.";
+    t[831] = "Опита за връзка бе неуспешен.";
     t[834] = "{0} function takes one and only one argument.";
-    t[835] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 {0} \u043c\u043e\u0436\u0435 \u0434\u0430 \u043f\u0440\u0438\u0435\u043c\u0435 \u0441\u0430\u043c\u043e \u0435\u0434\u0438\u043d \u0435\u0434\u0438\u043d\u0441\u0442\u0432\u0435\u043d \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442.";
+    t[835] = "Функцията {0} може да приеме само един единствен аргумент.";
     t[838] = "suspend/resume not implemented";
-    t[839] = "\u0441\u043f\u0438\u0440\u0430\u043d\u0435 / \u0437\u0430\u043f\u043e\u0447\u0432\u0430\u043d\u0435 \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0437\u0430 \u043c\u043e\u043c\u0435\u043d\u0442\u0430";
+    t[839] = "спиране / започване не се поддържа за момента";
     t[840] = "Error preparing transaction. prepare xid={0}";
-    t[841] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u0434\u0433\u043e\u0442\u0432\u044f\u043d\u0435 \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f. prepare xid={0}";
+    t[841] = "Грешка при подготвяне на транзакция. prepare xid={0}";
     t[842] = "The driver currently does not support COPY operations.";
-    t[843] = "\u0417\u0430 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0434\u0440\u0430\u0439\u0432\u044a\u0440\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 COPY \u043a\u043e\u043c\u0430\u043d\u0434\u0438.";
+    t[843] = "За момента драйвъра не поддържа COPY команди.";
     t[852] = "Heuristic commit/rollback not supported. forget xid={0}";
-    t[853] = "\u0415\u0432\u0440\u0438\u0441\u0442\u0438\u0447\u0435\u043d commit \u0438\u043b\u0438 rollback \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430. forget xid={0}";
+    t[853] = "Евристичен commit или rollback не се поддържа. forget xid={0}";
     t[856] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[857] = "\u0411\u044f\u0445\u0430 \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u0438 \u043d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0438 \u0434\u0430\u043d\u043d\u0438. \u0422\u043e\u0432\u0430 \u043d\u0430\u0439-\u0432\u0435\u0440\u043e\u044f\u0442\u043d\u043e \u0441\u0435 \u0434\u044a\u043b\u0436\u0438 \u043d\u0430 \u0441\u044a\u0445\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0438 \u0434\u0430\u043d\u043d\u0438, \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u0449\u0438 \u0441\u0438\u043c\u0432\u043e\u043b\u0438, \u043a\u043e\u0438\u0442\u043e \u0441\u0430 \u043d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0438 \u0437\u0430 \u043d\u0430\u0431\u043e\u0440\u0430 \u043e\u0442 \u0437\u043d\u0430\u0446\u0438 \u043f\u0440\u0438 \u0441\u044a\u0437\u0434\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438. \u0427\u0435\u0441\u0442 \u043f\u0440\u0438\u043c\u0435\u0440 \u0437\u0430 \u0442\u043e\u0432\u0430 \u0435 \u0441\u044a\u0445\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 8bit \u0434\u0430\u043d\u043d\u0438 \u0432 SQL_ASCII \u0431\u0430\u0437\u0438 \u0434\u0430\u043d\u043d\u0438.";
+    t[857] = "Бяха намерени невалидни данни. Това най-вероятно се дължи на съхранявани данни, съдържащи символи, които са невалидни за набора от знаци при създаване на базата данни. Чест пример за това е съхраняване на 8bit данни в SQL_ASCII бази данни.";
     t[858] = "Cannot establish a savepoint in auto-commit mode.";
-    t[859] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438 savepoint \u0432 auto-commit \u043c\u043e\u0434\u0443\u0441.";
+    t[859] = "Не може да се установи savepoint в auto-commit модус.";
     t[862] = "The column name {0} was not found in this ResultSet.";
-    t[863] = "\u0418\u043c\u0435\u0442\u043e \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430 {0} \u043d\u0435 \u0431\u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u043e \u0432 \u0442\u043e\u0437\u0438 ResultSet.";
+    t[863] = "Името на колоната {0} не бе намерено в този ResultSet.";
     t[864] = "Prepare called before end. prepare xid={0}, state={1}";
-    t[865] = "Prepare \u0438\u0437\u0432\u0438\u043a\u0430\u043d\u043e \u043f\u0440\u0435\u0434\u0438 \u043a\u0440\u0430\u044f. prepare xid={0}, state={1}";
+    t[865] = "Prepare извикано преди края. prepare xid={0}, state={1}";
     t[866] = "Unknown Types value.";
-    t[867] = "\u0421\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043e\u0442 \u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043d \u0442\u0438\u043f.";
+    t[867] = "Стойност от неизвестен тип.";
     t[870] = "Cannot call updateRow() when on the insert row.";
-    t[871] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0438 updateRow() \u043c\u0435\u0442\u043e\u0434\u0430, \u043a\u043e\u0433\u0430\u0442\u043e \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430\u043c\u0435 \u043f\u0440\u0438 \u0440\u0435\u0434\u0438\u0446\u0430\u0442\u0430 \u043d\u0430 \u0432\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435.";
+    t[871] = "Не може да се изпълни updateRow() метода, когато се намираме при редицата на въвеждане.";
     t[876] = "Database connection failed when reading from copy";
-    t[877] = "\u041d\u0435\u043e\u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u043a\u044a\u043c \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438 \u043f\u0440\u0438 \u0447\u0435\u0442\u0435\u043d\u0435 \u043e\u0442 \u043a\u043e\u043f\u0438\u0435";
+    t[877] = "Неосъществена връзка към базата данни при четене от копие";
     t[880] = "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, currentXid={2}";
-    t[881] = "\u0413\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0432\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0441\u044a\u0441\u0442\u043e\u044f\u043d\u0438\u0435\u0442\u043e \u043f\u0440\u0435\u0434\u0438 \u043f\u043e\u0434\u0433\u043e\u0442\u0432\u0435\u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f. rollback xid={0}, preparedXid={1}, currentXid={2}";
+    t[881] = "Грешка при възстановяване на състоянието преди подготвена транзакция. rollback xid={0}, preparedXid={1}, currentXid={2}";
     t[882] = "Can''t use relative move methods while on the insert row.";
-    t[883] = "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442 \u043e\u0442\u043d\u043e\u0441\u0438\u0442\u0435\u043b\u043d\u0438 \u043c\u0435\u0442\u043e\u0434\u0438 \u0437\u0430 \u0434\u0432\u0438\u0436\u0435\u043d\u0438\u0435, \u043a\u043e\u0433\u0430\u0442\u043e \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430\u043c\u0435 \u043f\u0440\u0438 \u0440\u0435\u0434\u0438\u0446\u0430\u0442\u0430 \u043d\u0430 \u0432\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435.";
+    t[883] = "Не може да се използват относителни методи за движение, когато се намираме при редицата на въвеждане.";
     t[884] = "free() was called on this LOB previously";
-    t[885] = "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 free() \u0431\u0435 \u0432\u0435\u0447\u0435 \u0438\u0437\u0432\u0438\u043a\u0430\u043d\u0430 \u0437\u0430 \u0442\u043e\u0437\u0438 \u0433\u043e\u043b\u044f\u043c \u043e\u0431\u0435\u043a\u0442 LOB";
+    t[885] = "Функцията free() бе вече извикана за този голям обект LOB";
     t[888] = "A CallableStatement was executed with nothing returned.";
-    t[889] = "CallableStatement \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0431\u0435 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0435\u043d\u0430, \u043d\u043e \u043d\u044f\u043c\u0430 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438.";
+    t[889] = "CallableStatement функция бе обработена, но няма резултати.";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_cs.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_cs.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_cs.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_cs.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,183 +5,183 @@
   static {
     java.lang.String[] t = new java.lang.String[314];
     t[0] = "";
-    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.0\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2005-08-21 20:00+0200\nLast-Translator: Petr Dittrich <bodyn@medoro.org>\nLanguage-Team: \nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
+    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.0\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2005-08-21 20:00+0200\nLast-Translator: Petr Dittrich <bodyn@medoro.org>\nLanguage-Team: \nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
     t[2] = "A connection could not be made using the requested protocol {0}.";
-    t[3] = "Spojen\u00ed nelze vytvo\u0159it s pou\u017eit\u00edm \u017e\u00e1dan\u00e9ho protokolu {0}.";
+    t[3] = "Spojení nelze vytvořit s použitím žádaného protokolu {0}.";
     t[4] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[5] = "Po\u0161kozen\u00e1 funkce nebo opu\u0161t\u011bn\u00ed procedury na pozici {0}.";
+    t[5] = "Poškozená funkce nebo opuštění procedury na pozici {0}.";
     t[8] = "Cannot cast an instance of {0} to type {1}";
-    t[9] = "Nemohu p\u0159etypovat instanci {0} na typ {1}";
+    t[9] = "Nemohu přetypovat instanci {0} na typ {1}";
     t[12] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[13] = "ResultSet nen\u00ed aktualizavateln\u00fd. Dotaz mus\u00ed vyb\u00edrat pouze z jedn\u00e9 tabulky a mus\u00ed obsahovat v\u0161echny prim\u00e1rn\u00ed kl\u00ed\u010de tabulky. Koukni do JDBC 2.1 API Specifikace, sekce 5.6 pro v\u00edce podrobnost\u00ed.";
+    t[13] = "ResultSet není aktualizavatelný. Dotaz musí vybírat pouze z jedné tabulky a musí obsahovat všechny primární klíče tabulky. Koukni do JDBC 2.1 API Specifikace, sekce 5.6 pro více podrobností.";
     t[14] = "The JVM claims not to support the {0} encoding.";
-    t[15] = "JVM tvrd\u00ed, \u017ee nepodporuje kodov\u00e1n\u00ed {0}.";
+    t[15] = "JVM tvrdí, že nepodporuje kodování {0}.";
     t[16] = "An I/O error occurred while sending to the backend.";
-    t[17] = "Vystupn\u011b/v\u00fdstupn\u00ed chyba p\u0159i odes\u00edl\u00e1n\u00ed k backend.";
+    t[17] = "Vystupně/výstupní chyba při odesílání k backend.";
     t[18] = "Statement has been closed.";
-    t[19] = "Statement byl uzav\u0159en.";
+    t[19] = "Statement byl uzavřen.";
     t[20] = "Unknown Types value.";
-    t[21] = "Nezn\u00e1m\u00e1 hodnota typu.";
+    t[21] = "Neznámá hodnota typu.";
     t[22] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[23] = "ResultSets se soub\u011b\u017enost\u00ed CONCUR_READ_ONLY nem\u016f\u017ee b\u00fdt aktualizov\u00e1no";
+    t[23] = "ResultSets se souběžností CONCUR_READ_ONLY nemůže být aktualizováno";
     t[26] = "You must specify at least one column value to insert a row.";
-    t[27] = "Mus\u00edte vyplnit alespo\u0148 jeden sloupec pro vlo\u017een\u00ed \u0159\u00e1dku.";
+    t[27] = "Musíte vyplnit alespoň jeden sloupec pro vložení řádku.";
     t[32] = "No primary key found for table {0}.";
-    t[33] = "Nenalezen prim\u00e1rn\u00ed kl\u00ed\u010d pro tabulku {0}.";
+    t[33] = "Nenalezen primární klíč pro tabulku {0}.";
     t[34] = "Cannot establish a savepoint in auto-commit mode.";
-    t[35] = "Nemohu vytvo\u0159it savepoint v auto-commit modu.";
+    t[35] = "Nemohu vytvořit savepoint v auto-commit modu.";
     t[38] = "Can''t use relative move methods while on the insert row.";
-    t[39] = "Nem\u016f\u017eete pou\u017e\u00edvat relativn\u00ed p\u0159esuny p\u0159i vkl\u00e1d\u00e1n\u00ed \u0159\u00e1dku.";
+    t[39] = "Nemůžete používat relativní přesuny při vkládání řádku.";
     t[44] = "The column name {0} was not found in this ResultSet.";
-    t[45] = "Sloupec pojmenovan\u00fd {0} nebyl nalezen v ResultSet.";
+    t[45] = "Sloupec pojmenovaný {0} nebyl nalezen v ResultSet.";
     t[46] = "This statement has been closed.";
-    t[47] = "P\u0159\u00edkaz byl uzav\u0159en.";
+    t[47] = "Příkaz byl uzavřen.";
     t[48] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[49] = "T\u0159\u00edda SSLSocketFactory poskytla {0} co\u017e nem\u016f\u017ee b\u00fdt instancionizov\u00e1no.";
+    t[49] = "Třída SSLSocketFactory poskytla {0} což nemůže být instancionizováno.";
     t[50] = "Multiple ResultSets were returned by the query.";
-    t[51] = "V\u00edcen\u00e1sobn\u00fd ResultSet byl vr\u00e1cen dotazem.";
+    t[51] = "Vícenásobný ResultSet byl vrácen dotazem.";
     t[52] = "DataSource has been closed.";
-    t[53] = "DataSource byl uzav\u0159en.";
+    t[53] = "DataSource byl uzavřen.";
     t[56] = "Error loading default settings from driverconfig.properties";
-    t[57] = "Chyba na\u010d\u00edt\u00e1n\u00ed standardn\u00edho nastaven\u00ed z driverconfig.properties";
+    t[57] = "Chyba načítání standardního nastavení z driverconfig.properties";
     t[62] = "Bad value for type {0} : {1}";
-    t[63] = "\u0160patn\u00e1 hodnota pro typ {0} : {1}";
+    t[63] = "Špatná hodnota pro typ {0} : {1}";
     t[66] = "Method {0} is not yet implemented.";
-    t[67] = "Metoda {0} nen\u00ed implementov\u00e1na.";
+    t[67] = "Metoda {0} není implementována.";
     t[68] = "The array index is out of range: {0}";
     t[69] = "Index pole mimo rozsah: {0}";
     t[70] = "Unexpected command status: {0}.";
-    t[71] = "Neo\u010dek\u00e1van\u00fd stav p\u0159\u00edkazu: {0}.";
+    t[71] = "Neočekávaný stav příkazu: {0}.";
     t[74] = "Expected command status BEGIN, got {0}.";
-    t[75] = "O\u010dek\u00e1v\u00e1n p\u0159\u00edkaz BEGIN, obdr\u017een {0}.";
+    t[75] = "Očekáván příkaz BEGIN, obdržen {0}.";
     t[76] = "Cannot retrieve the id of a named savepoint.";
-    t[77] = "Nemohu z\u00edskat id nepojmenovan\u00e9ho savepointu.";
+    t[77] = "Nemohu získat id nepojmenovaného savepointu.";
     t[78] = "Unexpected error writing large object to database.";
-    t[79] = "Neo\u010dek\u00e1van\u00e1 chyba p\u0159i zapisov\u00e1n\u00ed velk\u00e9ho objektu do datab\u00e1ze.";
+    t[79] = "Neočekávaná chyba při zapisování velkého objektu do databáze.";
     t[84] = "Not on the insert row.";
-    t[85] = "Ne na vkl\u00e1dan\u00e9m \u0159\u00e1dku.";
+    t[85] = "Ne na vkládaném řádku.";
     t[86] = "Returning autogenerated keys is not supported.";
-    t[87] = "Vr\u00e1cen\u00ed automaticky generovan\u00fdch kl\u00ed\u010d\u016f nen\u00ed podporov\u00e1no.";
+    t[87] = "Vrácení automaticky generovaných klíčů není podporováno.";
     t[88] = "The server requested password-based authentication, but no password was provided.";
-    t[89] = "Server vy\u017eaduje ov\u011b\u0159en\u00ed heslem, ale \u017e\u00e1dn\u00e9 nebylo posl\u00e1no.";
+    t[89] = "Server vyžaduje ověření heslem, ale žádné nebylo posláno.";
     t[98] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[99] = "Nemohu na\u010d\u00edst t\u0159\u00eddu {0} odpov\u011bdnou za typ {1}";
+    t[99] = "Nemohu načíst třídu {0} odpovědnou za typ {1}";
     t[100] = "Invalid fetch direction constant: {0}.";
-    t[101] = "\u0160patn\u00fd sm\u011br \u010dten\u00ed: {0}.";
+    t[101] = "Špatný směr čtení: {0}.";
     t[102] = "Conversion of money failed.";
-    t[103] = "P\u0159evod pen\u011bz selhal.";
+    t[103] = "Převod peněz selhal.";
     t[104] = "Connection has been closed.";
-    t[105] = "Spojeni bylo uzav\u0159eno.";
+    t[105] = "Spojeni bylo uzavřeno.";
     t[106] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[107] = "Nemohu z\u00edskat n\u00e1zev nepojmenovan\u00e9ho savepointu.";
+    t[107] = "Nemohu získat název nepojmenovaného savepointu.";
     t[108] = "Large Objects may not be used in auto-commit mode.";
-    t[109] = "Velk\u00e9 objecky nemohou b\u00fdt pou\u017eity v auto-commit modu.";
+    t[109] = "Velké objecky nemohou být použity v auto-commit modu.";
     t[110] = "This ResultSet is closed.";
-    t[111] = "Tento ResultSet je uzav\u0159en\u00fd.";
+    t[111] = "Tento ResultSet je uzavřený.";
     t[116] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[117] = "N\u011bco neobvykl\u00e9ho p\u0159inutilo ovlada\u010d selhat. Pros\u00edm nahlaste tuto vyj\u00edmku.";
+    t[117] = "Něco neobvyklého přinutilo ovladač selhat. Prosím nahlaste tuto vyjímku.";
     t[118] = "The server does not support SSL.";
     t[119] = "Server nepodporuje SSL.";
     t[120] = "Invalid stream length {0}.";
-    t[121] = "Vadn\u00e1 d\u00e9lka proudu {0}.";
+    t[121] = "Vadná délka proudu {0}.";
     t[126] = "The maximum field size must be a value greater than or equal to 0.";
-    t[127] = "Maxim\u00e1ln\u00ed velikost pole mus\u00ed b\u00fdt nez\u00e1porn\u00e9 \u010d\u00edslo.";
+    t[127] = "Maximální velikost pole musí být nezáporné číslo.";
     t[130] = "Cannot call updateRow() when on the insert row.";
-    t[131] = "Nemohu volat updateRow() na vlk\u00e1dan\u00e9m \u0159\u00e1dku.";
+    t[131] = "Nemohu volat updateRow() na vlkádaném řádku.";
     t[132] = "A CallableStatement was executed with nothing returned.";
-    t[133] = "CallableStatement byl spu\u0161t\u011bn, le\u010d nic nebylo vr\u00e1ceno.";
+    t[133] = "CallableStatement byl spuštěn, leč nic nebylo vráceno.";
     t[134] = "Provided Reader failed.";
-    t[135] = "Selhal poskytnut\u00fd Reader.";
+    t[135] = "Selhal poskytnutý Reader.";
     t[146] = "Cannot call deleteRow() when on the insert row.";
-    t[147] = "Nem\u016f\u017eete volat deleteRow() p\u0159i vkl\u00e1d\u00e1n\u00ed \u0159\u00e1dku.";
+    t[147] = "Nemůžete volat deleteRow() při vkládání řádku.";
     t[156] = "Where: {0}";
     t[157] = "Kde: {0}";
     t[158] = "An unexpected result was returned by a query.";
-    t[159] = "Obdr\u017een neo\u010dek\u00e1van\u00fd v\u00fdsledek dotazu.";
+    t[159] = "Obdržen neočekávaný výsledek dotazu.";
     t[160] = "The connection attempt failed.";
-    t[161] = "Pokus o p\u0159ipojen\u00ed selhal.";
+    t[161] = "Pokus o připojení selhal.";
     t[162] = "Too many update results were returned.";
-    t[163] = "Bylo vr\u00e1ceno p\u0159\u00edli\u0161 mnoho v\u00fdsledk\u016f aktualizac\u00ed.";
+    t[163] = "Bylo vráceno příliš mnoho výsledků aktualizací.";
     t[164] = "Unknown type {0}.";
-    t[165] = "Nezn\u00e1m\u00fd typ {0}.";
+    t[165] = "Neznámý typ {0}.";
     t[166] = "{0} function takes two and only two arguments.";
-    t[167] = "Funkce {0} bere pr\u00e1v\u011b dva argumenty.";
+    t[167] = "Funkce {0} bere právě dva argumenty.";
     t[168] = "{0} function doesn''t take any argument.";
-    t[169] = "Funkce {0} nebere \u017e\u00e1dn\u00fd argument.";
+    t[169] = "Funkce {0} nebere žádný argument.";
     t[172] = "Unable to find name datatype in the system catalogs.";
-    t[173] = "Nemohu naj\u00edt n\u00e1zev typu v syst\u00e9mov\u00e9m katalogu.";
+    t[173] = "Nemohu najít název typu v systémovém katalogu.";
     t[174] = "Protocol error.  Session setup failed.";
-    t[175] = "Chyba protokolu. Nastaven\u00ed relace selhalo.";
+    t[175] = "Chyba protokolu. Nastavení relace selhalo.";
     t[176] = "{0} function takes one and only one argument.";
     t[177] = "Funkce {0} bere jeden argument.";
     t[186] = "The driver currently does not support COPY operations.";
-    t[187] = "Ovlada\u010d nyn\u00ed nepodporuje p\u0159\u00edkaz COPY.";
+    t[187] = "Ovladač nyní nepodporuje příkaz COPY.";
     t[190] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[191] = "Nalezena vada ve znakov\u00fdch datech. Toto m\u016f\u017ee b\u00fdt zp\u016fsobeno ulo\u017een\u00fdmi daty obsahuj\u00edc\u00edmi znaky, kter\u00e9 jsou z\u00e1vadn\u00e9 pro znakovou sadu nastavenou p\u0159i zakl\u00e1d\u00e1n\u00ed datab\u00e1ze. Nejzn\u00e1mej\u0161\u00ed p\u0159\u00edklad je ukl\u00e1d\u00e1n\u00ed 8bitov\u00fdch dat vSQL_ASCII datab\u00e1zi.";
+    t[191] = "Nalezena vada ve znakových datech. Toto může být způsobeno uloženými daty obsahujícími znaky, které jsou závadné pro znakovou sadu nastavenou při zakládání databáze. Nejznámejší příklad je ukládání 8bitových dat vSQL_ASCII databázi.";
     t[196] = "Fetch size must be a value greater to or equal to 0.";
-    t[197] = "Nabran\u00e1 velikost mus\u00ed b\u00fdt nez\u00e1porn\u00e1.";
+    t[197] = "Nabraná velikost musí být nezáporná.";
     t[204] = "Unsupported Types value: {0}";
-    t[205] = "Nepodporovan\u00e1 hodnota typu: {0}";
+    t[205] = "Nepodporovaná hodnota typu: {0}";
     t[206] = "Can''t refresh the insert row.";
-    t[207] = "Nemohu obnovit vkl\u00e1dan\u00fd \u0159\u00e1dek.";
+    t[207] = "Nemohu obnovit vkládaný řádek.";
     t[210] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[211] = "Maxim\u00e1ln\u00ed po\u010det \u0159\u00e1dek mus\u00ed b\u00fdt nez\u00e1porn\u00e9 \u010d\u00edslo.";
+    t[211] = "Maximální počet řádek musí být nezáporné číslo.";
     t[216] = "No value specified for parameter {0}.";
-    t[217] = "Nespecifikov\u00e1na hodnota parametru {0}.";
+    t[217] = "Nespecifikována hodnota parametru {0}.";
     t[218] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[219] = "Index pole mimo rozsah: {0}, po\u010det prvk\u016f: {1}.";
+    t[219] = "Index pole mimo rozsah: {0}, počet prvků: {1}.";
     t[220] = "Provided InputStream failed.";
-    t[221] = "Selhal poskytnut\u00fd InputStream.";
+    t[221] = "Selhal poskytnutý InputStream.";
     t[226] = "Failed to initialize LargeObject API";
     t[227] = "Selhala inicializace LargeObject API";
     t[228] = "Cannot reference a savepoint after it has been released.";
-    t[229] = "Nemohu z\u00edskat odkaz na savepoint, kdy\u017e byl uvoln\u011bn.";
+    t[229] = "Nemohu získat odkaz na savepoint, když byl uvolněn.";
     t[232] = "An error occurred while setting up the SSL connection.";
-    t[233] = "Nastala chyba p\u0159i nastaven\u00ed SSL spojen\u00ed.";
+    t[233] = "Nastala chyba při nastavení SSL spojení.";
     t[246] = "Detail: {0}";
     t[247] = "Detail: {0}";
     t[248] = "This PooledConnection has already been closed.";
-    t[249] = "Tento PooledConnection byl uzav\u0159en.";
+    t[249] = "Tento PooledConnection byl uzavřen.";
     t[250] = "A result was returned when none was expected.";
-    t[251] = "Obdr\u017een v\u00fdsledek, ikdy\u017e \u017e\u00e1dn\u00fd nebyl o\u010dek\u00e1v\u00e1n.";
+    t[251] = "Obdržen výsledek, ikdyž žádný nebyl očekáván.";
     t[254] = "The JVM claims not to support the encoding: {0}";
-    t[255] = "JVM tvrd\u00ed, \u017ee nepodporuje kodov\u00e1n\u00ed: {0}";
+    t[255] = "JVM tvrdí, že nepodporuje kodování: {0}";
     t[256] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[257] = "Index parametru mimo rozsah: {0}, po\u010det parametr\u016f {1}.";
+    t[257] = "Index parametru mimo rozsah: {0}, počet parametrů {1}.";
     t[258] = "LOB positioning offsets start at 1.";
-    t[259] = "Za\u010d\u00e1tek pozicov\u00e1n\u00ed LOB za\u010d\u00edna na 1.";
+    t[259] = "Začátek pozicování LOB začína na 1.";
     t[260] = "{0} function takes two or three arguments.";
-    t[261] = "Funkce {0} bere dva nebo t\u0159i argumenty.";
+    t[261] = "Funkce {0} bere dva nebo tři argumenty.";
     t[262] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[263] = "Pr\u00e1v\u011b jste za pozic\u00ed konce ResultSetu. Zde nem\u016f\u017eete volat deleteRow().s";
+    t[263] = "Právě jste za pozicí konce ResultSetu. Zde nemůžete volat deleteRow().s";
     t[266] = "Server SQLState: {0}";
     t[267] = "Server SQLState: {0}";
     t[270] = "{0} function takes four and only four argument.";
-    t[271] = "Funkce {0} bere p\u0159esn\u011b \u010dty\u0159i argumenty.";
+    t[271] = "Funkce {0} bere přesně čtyři argumenty.";
     t[272] = "Failed to create object for: {0}.";
-    t[273] = "Selhalo vytvo\u0159en\u00ed objektu: {0}.";
+    t[273] = "Selhalo vytvoření objektu: {0}.";
     t[274] = "No results were returned by the query.";
-    t[275] = "Neobdr\u017een \u017e\u00e1dn\u00fd v\u00fdsledek dotazu.";
+    t[275] = "Neobdržen žádný výsledek dotazu.";
     t[276] = "Position: {0}";
     t[277] = "Pozice: {0}";
     t[278] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[279] = "Index sloupece je mimo rozsah: {0}, po\u010det sloupc\u016f: {1}.";
+    t[279] = "Index sloupece je mimo rozsah: {0}, počet sloupců: {1}.";
     t[280] = "Unknown Response Type {0}.";
-    t[281] = "Nezn\u00e1m\u00fd typ odpov\u011bdi {0}.";
+    t[281] = "Neznámý typ odpovědi {0}.";
     t[284] = "Hint: {0}";
     t[285] = "Rada: {0}";
     t[286] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[287] = "Poloha: Soubor: {0}, Rutina: {1}, \u0158\u00e1dek: {2}";
+    t[287] = "Poloha: Soubor: {0}, Rutina: {1}, Řádek: {2}";
     t[288] = "Query timeout must be a value greater than or equals to 0.";
-    t[289] = "\u010casov\u00fd limit dotazu mus\u00ed b\u00fdt nez\u00e1porn\u00e9 \u010d\u00edslo.";
+    t[289] = "Časový limit dotazu musí být nezáporné číslo.";
     t[292] = "Unable to translate data into the desired encoding.";
-    t[293] = "Nemohu p\u0159elo\u017eit data do po\u017eadovan\u00e9ho k\u00f3dov\u00e1n\u00ed.";
+    t[293] = "Nemohu přeložit data do požadovaného kódování.";
     t[296] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[297] = "Nem\u016f\u017eete volat cancelRowUpdates() p\u0159i vkl\u00e1d\u00e1n\u00ed \u0159\u00e1dku.";
+    t[297] = "Nemůžete volat cancelRowUpdates() při vkládání řádku.";
     t[298] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[299] = "Ov\u011b\u0159en\u00ed typu {0} nen\u00ed podporov\u00e1no. Zkontrolujte zda konfigura\u010dn\u00ed soubor pg_hba.conf obsahuje klientskou IP adresu \u010di pods\u00ed\u0165 a zda je pou\u017eit\u00e9 ov\u011b\u0159enovac\u00ed sch\u00e9ma podporov\u00e1no ovlada\u010dem.";
+    t[299] = "Ověření typu {0} není podporováno. Zkontrolujte zda konfigurační soubor pg_hba.conf obsahuje klientskou IP adresu či podsíť a zda je použité ověřenovací schéma podporováno ovladačem.";
     t[308] = "There are no rows in this ResultSet.";
-    t[309] = "\u017d\u00e1dn\u00fd \u0159\u00e1dek v ResultSet.";
+    t[309] = "Žádný řádek v ResultSet.";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_de.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_de.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_de.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_de.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,7 +5,7 @@
   static {
     java.lang.String[] t = new java.lang.String[794];
     t[0] = "";
-    t[1] = "Project-Id-Version: head-de\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2008-09-12 14:22+0200\nLast-Translator: Andre Bialojahn <ab.spamnews@freenet.de>\nLanguage-Team: Deutsch\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.0.2\nX-Poedit-Language: German\nX-Poedit-Country: GERMANY\n";
+    t[1] = "Project-Id-Version: head-de\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2008-09-12 14:22+0200\nLast-Translator: Andre Bialojahn <ab.spamnews@freenet.de>\nLanguage-Team: Deutsch\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.0.2\nX-Poedit-Language: German\nX-Poedit-Country: GERMANY\n";
     t[4] = "DataSource has been closed.";
     t[5] = "Die Datenquelle wurde geschlossen.";
     t[18] = "Where: {0}";
@@ -17,29 +17,29 @@
     t[36] = "Multiple ResultSets were returned by the query.";
     t[37] = "Die Abfrage ergab mehrere ResultSets.";
     t[50] = "Too many update results were returned.";
-    t[51] = "Zu viele Updateergebnisse wurden zur\u00fcckgegeben.";
+    t[51] = "Zu viele Updateergebnisse wurden zurückgegeben.";
     t[58] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[59] = "Ung\u00fcltige UTF-8-Sequenz: das erste Byte ist {0}: {1}";
+    t[59] = "Ungültige UTF-8-Sequenz: das erste Byte ist {0}: {1}";
     t[66] = "The column name {0} was not found in this ResultSet.";
     t[67] = "Der Spaltenname {0} wurde in diesem ResultSet nicht gefunden.";
     t[70] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[71] = "Der Fastpath-Aufruf {0} gab kein Ergebnis zur\u00fcck, jedoch wurde ein Integer erwartet.";
+    t[71] = "Der Fastpath-Aufruf {0} gab kein Ergebnis zurück, jedoch wurde ein Integer erwartet.";
     t[74] = "Protocol error.  Session setup failed.";
     t[75] = "Protokollfehler.  Die Sitzung konnte nicht gestartet werden.";
     t[76] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
     t[77] = "Ein CallableStatement wurde deklariert, aber kein Aufruf von ''registerOutParameter(1, <some type>)'' erfolgte.";
     t[78] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[79] = "ResultSets, deren Zugriffsart CONCUR_READ_ONLY ist, k\u00f6nnen nicht aktualisiert werden.";
+    t[79] = "ResultSets, deren Zugriffsart CONCUR_READ_ONLY ist, können nicht aktualisiert werden.";
     t[90] = "LOB positioning offsets start at 1.";
-    t[91] = "Positionsoffsets f\u00fcr LOBs beginnen bei 1.";
+    t[91] = "Positionsoffsets für LOBs beginnen bei 1.";
     t[92] = "Internal Position: {0}";
     t[93] = "Interne Position: {0}";
     t[96] = "free() was called on this LOB previously";
-    t[97] = "free() wurde bereits f\u00fcr dieses LOB aufgerufen.";
+    t[97] = "free() wurde bereits für dieses LOB aufgerufen.";
     t[100] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[101] = "Die Nur-Lesen-Eigenschaft einer Transaktion kann nicht w\u00e4hrend der Transaktion ver\u00e4ndert werden.";
+    t[101] = "Die Nur-Lesen-Eigenschaft einer Transaktion kann nicht während der Transaktion verändert werden.";
     t[102] = "The JVM claims not to support the {0} encoding.";
-    t[103] = "Die JVM behauptet, die Zeichenkodierung {0} nicht zu unterst\u00fctzen.";
+    t[103] = "Die JVM behauptet, die Zeichenkodierung {0} nicht zu unterstützen.";
     t[108] = "{0} function doesn''t take any argument.";
     t[109] = "Die {0}-Funktion akzeptiert kein Argument.";
     t[112] = "xid must not be null";
@@ -47,9 +47,9 @@
     t[114] = "Connection has been closed.";
     t[115] = "Die Verbindung wurde geschlossen.";
     t[122] = "The server does not support SSL.";
-    t[123] = "Der Server unterst\u00fctzt SSL nicht.";
+    t[123] = "Der Server unterstützt SSL nicht.";
     t[140] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[141] = "Ung\u00fcltige UTF-8-Sequenz: Byte {0} der {1} Bytesequenz ist nicht 10xxxxxx: {2}";
+    t[141] = "Ungültige UTF-8-Sequenz: Byte {0} der {1} Bytesequenz ist nicht 10xxxxxx: {2}";
     t[148] = "Hint: {0}";
     t[149] = "Hinweis: {0}";
     t[152] = "Unable to find name datatype in the system catalogs.";
@@ -63,21 +63,21 @@
     t[170] = "Finalizing a Connection that was never closed:";
     t[171] = "Eine Connection wurde finalisiert, die nie geschlossen wurde:";
     t[180] = "The maximum field size must be a value greater than or equal to 0.";
-    t[181] = "Die maximale Feldgr\u00f6\u00dfe muss ein Wert gr\u00f6\u00dfer oder gleich Null sein.";
+    t[181] = "Die maximale Feldgröße muss ein Wert größer oder gleich Null sein.";
     t[186] = "PostgreSQL LOBs can only index to: {0}";
-    t[187] = "LOBs in PostgreSQL k\u00f6nnen nur auf {0} verweisen.";
+    t[187] = "LOBs in PostgreSQL können nur auf {0} verweisen.";
     t[194] = "Method {0} is not yet implemented.";
     t[195] = "Die Methode {0} ist noch nicht implementiert.";
     t[198] = "Error loading default settings from driverconfig.properties";
     t[199] = "Fehler beim Laden der Voreinstellungen aus driverconfig.properties";
     t[200] = "Results cannot be retrieved from a CallableStatement before it is executed.";
-    t[201] = "Ergebnisse k\u00f6nnen nicht von einem CallableStatement abgerufen werden, bevor es ausgef\u00fchrt wurde.";
+    t[201] = "Ergebnisse können nicht von einem CallableStatement abgerufen werden, bevor es ausgeführt wurde.";
     t[202] = "Large Objects may not be used in auto-commit mode.";
-    t[203] = "LargeObjects (LOB) d\u00fcrfen im Modus ''auto-commit'' nicht verwendet werden.";
+    t[203] = "LargeObjects (LOB) dürfen im Modus ''auto-commit'' nicht verwendet werden.";
     t[208] = "Expected command status BEGIN, got {0}.";
     t[209] = "Statt des erwarteten Befehlsstatus BEGIN, wurde {0} empfangen.";
     t[218] = "Invalid fetch direction constant: {0}.";
-    t[219] = "Unzul\u00e4ssige Richtungskonstante bei fetch: {0}.";
+    t[219] = "Unzulässige Richtungskonstante bei fetch: {0}.";
     t[222] = "{0} function takes three and only three arguments.";
     t[223] = "Die {0}-Funktion erwartet genau drei Argumente.";
     t[226] = "Error during recover";
@@ -85,7 +85,7 @@
     t[228] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
     t[229] = "Das ResultSet kann nicht aktualisiert werden, da es entweder vor oder nach dem Ende der Ergebnisse ist.";
     t[230] = "The JVM claims not to support the encoding: {0}";
-    t[231] = "Die JVM behauptet, die Zeichenkodierung {0} nicht zu unterst\u00fctzen.";
+    t[231] = "Die JVM behauptet, die Zeichenkodierung {0} nicht zu unterstützen.";
     t[232] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
     t[233] = "Ein Parameter des Typs {0} wurde registriert, jedoch erfolgte ein Aufruf get{1} (sqltype={2}).";
     t[240] = "Cannot establish a savepoint in auto-commit mode.";
@@ -93,33 +93,33 @@
     t[242] = "Cannot retrieve the id of a named savepoint.";
     t[243] = "Die ID eines benamten Rettungspunktes kann nicht ermittelt werden.";
     t[244] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[245] = "Der Spaltenindex {0} ist au\u00dferhalb des g\u00fcltigen Bereichs. Anzahl Spalten: {1}.";
+    t[245] = "Der Spaltenindex {0} ist außerhalb des gültigen Bereichs. Anzahl Spalten: {1}.";
     t[250] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[251] = "Etwas Ungew\u00f6hnliches ist passiert, das den Treiber fehlschlagen lie\u00df. Bitte teilen Sie diesen Fehler mit.";
+    t[251] = "Etwas Ungewöhnliches ist passiert, das den Treiber fehlschlagen ließ. Bitte teilen Sie diesen Fehler mit.";
     t[260] = "Cannot cast an instance of {0} to type {1}";
-    t[261] = "Die Typwandlung f\u00fcr eine Instanz von {0} nach {1} ist nicht m\u00f6glich.";
+    t[261] = "Die Typwandlung für eine Instanz von {0} nach {1} ist nicht möglich.";
     t[264] = "Unknown Types value.";
     t[265] = "Unbekannter Typ.";
     t[266] = "Invalid stream length {0}.";
-    t[267] = "Ung\u00fcltige L\u00e4nge des Datenstroms: {0}.";
+    t[267] = "Ungültige Länge des Datenstroms: {0}.";
     t[272] = "Cannot retrieve the name of an unnamed savepoint.";
     t[273] = "Der Name eines namenlosen Rettungpunktes kann nicht ermittelt werden.";
     t[274] = "Unable to translate data into the desired encoding.";
-    t[275] = "Die Daten konnten nicht in die gew\u00fcnschte Kodierung gewandelt werden.";
+    t[275] = "Die Daten konnten nicht in die gewünschte Kodierung gewandelt werden.";
     t[276] = "Expected an EOF from server, got: {0}";
     t[277] = "Vom Server wurde ein EOF erwartet, jedoch {0} gelesen.";
     t[278] = "Bad value for type {0} : {1}";
-    t[279] = "Unzul\u00e4ssiger Wert f\u00fcr den Typ {0} : {1}.";
+    t[279] = "Unzulässiger Wert für den Typ {0} : {1}.";
     t[280] = "The server requested password-based authentication, but no password was provided.";
     t[281] = "Der Server verlangt passwortbasierte Authentifizierung, jedoch wurde kein Passwort angegeben.";
     t[296] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[297] = "Das Abschneiden gro\u00dfer Objekte ist nur in Versionen nach 8.3 implementiert.";
+    t[297] = "Das Abschneiden großer Objekte ist nur in Versionen nach 8.3 implementiert.";
     t[298] = "This PooledConnection has already been closed.";
     t[299] = "Diese PooledConnection ist bereits geschlossen worden.";
     t[302] = "ClientInfo property not supported.";
-    t[303] = "Die ClientInfo-Eigenschaft ist nicht unterst\u00fctzt.";
+    t[303] = "Die ClientInfo-Eigenschaft ist nicht unterstützt.";
     t[306] = "Fetch size must be a value greater to or equal to 0.";
-    t[307] = "Die Fetch-Gr\u00f6\u00dfe muss ein Wert gr\u00f6\u00dfer oder gleich Null sein.";
+    t[307] = "Die Fetch-Größe muss ein Wert größer oder gleich Null sein.";
     t[312] = "A connection could not be made using the requested protocol {0}.";
     t[313] = "Es konnte keine Verbindung unter Verwendung des Protokolls {0} hergestellt werden.";
     t[322] = "There are no rows in this ResultSet.";
@@ -127,111 +127,111 @@
     t[324] = "Unexpected command status: {0}.";
     t[325] = "Unerwarteter Befehlsstatus: {0}.";
     t[334] = "Not on the insert row.";
-    t[335] = "Nicht in der Einf\u00fcgezeile.";
+    t[335] = "Nicht in der Einfügezeile.";
     t[344] = "Server SQLState: {0}";
     t[345] = "Server SQLState: {0}";
     t[348] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
     t[349] = "Der standard_conforming_strings Parameter des Servers steht auf {0}. Der JDBC-Treiber erwartete on oder off.";
     t[360] = "The driver currently does not support COPY operations.";
-    t[361] = "Der Treiber unterst\u00fctzt derzeit keine COPY-Operationen.";
+    t[361] = "Der Treiber unterstützt derzeit keine COPY-Operationen.";
     t[364] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[365] = "Der Arrayindex {0} ist au\u00dferhalb des g\u00fcltigen Bereichs. Vorhandene Elemente: {1}.";
+    t[365] = "Der Arrayindex {0} ist außerhalb des gültigen Bereichs. Vorhandene Elemente: {1}.";
     t[374] = "suspend/resume not implemented";
     t[375] = "Anhalten/Fortsetzen ist nicht implementiert.";
     t[378] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
-    t[379] = "Nicht implementiert: Die einphasige Best\u00e4tigung muss \u00fcber die selbe Verbindung abgewickelt werden, die verwendet wurde, um sie zu beginnen.";
+    t[379] = "Nicht implementiert: Die einphasige Bestätigung muss über die selbe Verbindung abgewickelt werden, die verwendet wurde, um sie zu beginnen.";
     t[398] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[399] = "''cancelRowUpdates()'' kann in der Einf\u00fcgezeile nicht aufgerufen werden.";
+    t[399] = "''cancelRowUpdates()'' kann in der Einfügezeile nicht aufgerufen werden.";
     t[400] = "Cannot reference a savepoint after it has been released.";
     t[401] = "Ein Rettungspunkt kann nicht angesprochen werden, nach dem er entfernt wurde.";
     t[402] = "You must specify at least one column value to insert a row.";
-    t[403] = "Sie m\u00fcssen mindestens einen Spaltenwert angeben, um eine Zeile einzuf\u00fcgen.";
+    t[403] = "Sie müssen mindestens einen Spaltenwert angeben, um eine Zeile einzufügen.";
     t[404] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[405] = "Es konnte kein Wert f\u00fcr MaxIndexKeys gefunden werden, da die Systemkatalogdaten fehlen.";
+    t[405] = "Es konnte kein Wert für MaxIndexKeys gefunden werden, da die Systemkatalogdaten fehlen.";
     t[412] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[413] = "Ung\u00fcltige UTF-8-Sequenz: Der letzte Wert ist au\u00dferhalb des zul\u00e4ssigen Bereichs: {0}";
+    t[413] = "Ungültige UTF-8-Sequenz: Der letzte Wert ist außerhalb des zulässigen Bereichs: {0}";
     t[414] = "{0} function takes two or three arguments.";
     t[415] = "Die {0}-Funktion erwartet zwei oder drei Argumente.";
     t[440] = "Unexpected error writing large object to database.";
     t[441] = "Beim Schreiben eines LargeObjects (LOB) in die Datenbank trat ein unerwarteter Fehler auf.";
     t[442] = "Zero bytes may not occur in string parameters.";
-    t[443] = "Stringparameter d\u00fcrfen keine Nullbytes enthalten.";
+    t[443] = "Stringparameter dürfen keine Nullbytes enthalten.";
     t[444] = "A result was returned when none was expected.";
     t[445] = "Die Anweisung lieferte ein Ergebnis obwohl keines erwartet wurde.";
     t[450] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[451] = "Das ResultSet kann nicht aktualisiert werden.  Die Abfrage, die es erzeugte, darf nur eine Tabelle und muss darin alle Prim\u00e4rschl\u00fcssel ausw\u00e4hlen. Siehe JDBC 2.1 API-Spezifikation, Abschnitt 5.6 f\u00fcr mehr Details.";
+    t[451] = "Das ResultSet kann nicht aktualisiert werden.  Die Abfrage, die es erzeugte, darf nur eine Tabelle und muss darin alle Primärschlüssel auswählen. Siehe JDBC 2.1 API-Spezifikation, Abschnitt 5.6 für mehr Details.";
     t[454] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[455] = "Die Nachrichtenl\u00e4nge {0} ist zu gro\u00df. Das kann von sehr gro\u00dfen oder inkorrekten L\u00e4ngenangaben eines InputStream-Parameters herr\u00fchren.";
+    t[455] = "Die Nachrichtenlänge {0} ist zu groß. Das kann von sehr großen oder inkorrekten Längenangaben eines InputStream-Parameters herrühren.";
     t[460] = "Statement has been closed.";
     t[461] = "Die Anweisung wurde geschlossen.";
     t[462] = "No value specified for parameter {0}.";
-    t[463] = "F\u00fcr den Parameter {0} wurde kein Wert angegeben.";
+    t[463] = "Für den Parameter {0} wurde kein Wert angegeben.";
     t[468] = "The array index is out of range: {0}";
-    t[469] = "Der Arrayindex ist au\u00dferhalb des g\u00fcltigen Bereichs: {0}.";
+    t[469] = "Der Arrayindex ist außerhalb des gültigen Bereichs: {0}.";
     t[474] = "Unable to bind parameter values for statement.";
     t[475] = "Der Anweisung konnten keine Parameterwerte zugewiesen werden.";
     t[476] = "Can''t refresh the insert row.";
-    t[477] = "Die Einf\u00fcgezeile kann nicht aufgefrischt werden.";
+    t[477] = "Die Einfügezeile kann nicht aufgefrischt werden.";
     t[480] = "No primary key found for table {0}.";
-    t[481] = "F\u00fcr die Tabelle {0} konnte kein Prim\u00e4rschl\u00fcssel gefunden werden.";
+    t[481] = "Für die Tabelle {0} konnte kein Primärschlüssel gefunden werden.";
     t[482] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[483] = "Die Transaktions-Trennungsstufe kann nicht w\u00e4hrend einer Transaktion ver\u00e4ndert werden.";
+    t[483] = "Die Transaktions-Trennungsstufe kann nicht während einer Transaktion verändert werden.";
     t[498] = "Provided InputStream failed.";
     t[499] = "Der bereitgestellte InputStream scheiterte.";
     t[500] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[501] = "Der Parameterindex {0} ist au\u00dferhalb des g\u00fcltigen Bereichs. Es gibt {1} Parameter.";
+    t[501] = "Der Parameterindex {0} ist außerhalb des gültigen Bereichs. Es gibt {1} Parameter.";
     t[502] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[503] = "Der Parameter ''Date Style'' wurde auf dem Server auf {0} ver\u00e4ndert. Der JDBC-Treiber setzt f\u00fcr korrekte Funktion voraus, dass ''Date Style'' mit ''ISO'' beginnt.";
+    t[503] = "Der Parameter ''Date Style'' wurde auf dem Server auf {0} verändert. Der JDBC-Treiber setzt für korrekte Funktion voraus, dass ''Date Style'' mit ''ISO'' beginnt.";
     t[508] = "Connection attempt timed out.";
-    t[509] = "Keine Verbindung innerhalb des Zeitintervalls m\u00f6glich.";
+    t[509] = "Keine Verbindung innerhalb des Zeitintervalls möglich.";
     t[512] = "Internal Query: {0}";
     t[513] = "Interne Abfrage: {0}";
     t[518] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[519] = "Der Authentifizierungstyp {0} wird nicht unterst\u00fctzt. Stellen Sie sicher, dass die Datei ''pg_hba.conf'' die IP-Adresse oder das Subnetz des Clients enth\u00e4lt und dass der Client ein Authentifizierungsschema nutzt, das vom Treiber unterst\u00fctzt wird.";
+    t[519] = "Der Authentifizierungstyp {0} wird nicht unterstützt. Stellen Sie sicher, dass die Datei ''pg_hba.conf'' die IP-Adresse oder das Subnetz des Clients enthält und dass der Client ein Authentifizierungsschema nutzt, das vom Treiber unterstützt wird.";
     t[526] = "Interval {0} not yet implemented";
     t[527] = "Intervall {0} ist noch nicht implementiert.";
     t[532] = "Conversion of interval failed";
     t[533] = "Die Umwandlung eines Intervalls schlug fehl.";
     t[540] = "Query timeout must be a value greater than or equals to 0.";
-    t[541] = "Das Abfragetimeout muss ein Wert gr\u00f6\u00dfer oder gleich Null sein.";
+    t[541] = "Das Abfragetimeout muss ein Wert größer oder gleich Null sein.";
     t[542] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[543] = "Die Verbindung wurde automatisch geschlossen, da entweder eine neue Verbindung f\u00fcr die gleiche PooledConnection ge\u00f6ffnet wurde, oder die PooledConnection geschlossen worden ist..";
+    t[543] = "Die Verbindung wurde automatisch geschlossen, da entweder eine neue Verbindung für die gleiche PooledConnection geöffnet wurde, oder die PooledConnection geschlossen worden ist..";
     t[544] = "ResultSet not positioned properly, perhaps you need to call next.";
     t[545] = "Das ResultSet ist nicht richtig positioniert. Eventuell muss ''next'' aufgerufen werden.";
     t[550] = "This statement has been closed.";
     t[551] = "Die Anweisung wurde geschlossen.";
     t[552] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[553] = "Der in SQL f\u00fcr eine Instanz von {0} zu verwendende Datentyp kann nicht abgeleitet werden. Benutzen Sie ''setObject()'' mit einem expliziten Typ, um ihn festzulegen.";
+    t[553] = "Der in SQL für eine Instanz von {0} zu verwendende Datentyp kann nicht abgeleitet werden. Benutzen Sie ''setObject()'' mit einem expliziten Typ, um ihn festzulegen.";
     t[554] = "Cannot call updateRow() when on the insert row.";
-    t[555] = "''updateRow()'' kann in der Einf\u00fcgezeile nicht aufgerufen werden.";
+    t[555] = "''updateRow()'' kann in der Einfügezeile nicht aufgerufen werden.";
     t[562] = "Detail: {0}";
     t[563] = "Detail: {0}";
     t[566] = "Cannot call deleteRow() when on the insert row.";
-    t[567] = "''deleteRow()'' kann in der Einf\u00fcgezeile nicht aufgerufen werden.";
+    t[567] = "''deleteRow()'' kann in der Einfügezeile nicht aufgerufen werden.";
     t[568] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
     t[569] = "Die augenblickliche Position ist vor dem Beginn des ResultSets.  Dort kann ''deleteRow()'' nicht aufgerufen werden.";
     t[576] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[577] = "Ung\u00fcltige UTF-8-Sequenz: der letzte Wert ist ein Ersatzwert: {0}";
+    t[577] = "Ungültige UTF-8-Sequenz: der letzte Wert ist ein Ersatzwert: {0}";
     t[578] = "Unknown Response Type {0}.";
     t[579] = "Die Antwort weist einen unbekannten Typ auf: {0}.";
     t[582] = "Unsupported value for stringtype parameter: {0}";
-    t[583] = "Nichtunterst\u00fctzter Wert f\u00fcr den Stringparameter: {0}";
+    t[583] = "Nichtunterstützter Wert für den Stringparameter: {0}";
     t[584] = "Conversion to type {0} failed: {1}.";
     t[585] = "Die Umwandlung in den Typ {0} schlug fehl: {1}.";
     t[586] = "Conversion of money failed.";
-    t[587] = "Die Umwandlung eines W\u00e4hrungsbetrags schlug fehl.";
+    t[587] = "Die Umwandlung eines Währungsbetrags schlug fehl.";
     t[600] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[601] = "Die f\u00fcr den Datentyp {1} verantwortliche Klasse {0} konnte nicht geladen werden.";
+    t[601] = "Die für den Datentyp {1} verantwortliche Klasse {0} konnte nicht geladen werden.";
     t[604] = "The fastpath function {0} is unknown.";
     t[605] = "Die Fastpath-Funktion {0} ist unbekannt.";
     t[608] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[609] = "Unzul\u00e4ssige Syntax f\u00fcr ein Funktions- oder Prozedur-Escape an Offset {0}.";
+    t[609] = "Unzulässige Syntax für ein Funktions- oder Prozedur-Escape an Offset {0}.";
     t[612] = "Provided Reader failed.";
     t[613] = "Der bereitgestellte Reader scheiterte.";
     t[614] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[615] = "Die maximale Zeilenzahl muss ein Wert gr\u00f6\u00dfer oder gleich Null sein.";
+    t[615] = "Die maximale Zeilenzahl muss ein Wert größer oder gleich Null sein.";
     t[616] = "Failed to create object for: {0}.";
-    t[617] = "Erstellung des Objektes schlug fehl f\u00fcr: {0}.";
+    t[617] = "Erstellung des Objektes schlug fehl für: {0}.";
     t[622] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
     t[623] = "Vorzeitiges Ende des Eingabedatenstroms. Es wurden {0} Bytes erwartet, jedoch nur {1} gelesen.";
     t[626] = "An unexpected result was returned by a query.";
@@ -239,7 +239,7 @@
     t[646] = "An error occurred while setting up the SSL connection.";
     t[647] = "Beim Aufbau der SSL-Verbindung trat ein Fehler auf.";
     t[654] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
-    t[655] = "Ung\u00fcltige UTF-8-Sequenz: {0} Bytes wurden verwendet um einen {1} Bytewert zu kodieren: {2}";
+    t[655] = "Ungültige UTF-8-Sequenz: {0} Bytes wurden verwendet um einen {1} Bytewert zu kodieren: {2}";
     t[658] = "The SSLSocketFactory class provided {0} could not be instantiated.";
     t[659] = "Die von {0} bereitgestellte SSLSocketFactory-Klasse konnte nicht instanziiert werden.";
     t[670] = "Position: {0}";
@@ -249,13 +249,13 @@
     t[684] = "Cannot tell if path is open or closed: {0}.";
     t[685] = "Es konnte nicht ermittelt werden, ob der Pfad offen oder geschlossen ist: {0}.";
     t[700] = "Cannot convert an instance of {0} to type {1}";
-    t[701] = "Die Typwandlung f\u00fcr eine Instanz von {0} nach {1} ist nicht m\u00f6glich.";
+    t[701] = "Die Typwandlung für eine Instanz von {0} nach {1} ist nicht möglich.";
     t[710] = "{0} function takes four and only four argument.";
     t[711] = "Die {0}-Funktion erwartet genau vier Argumente.";
     t[718] = "Interrupted while attempting to connect.";
     t[719] = "Beim Verbindungsversuch trat eine Unterbrechung auf.";
     t[722] = "Your security policy has prevented the connection from being attempted.  You probably need to grant the connect java.net.SocketPermission to the database server host and port that you wish to connect to.";
-    t[723] = "Ihre Sicherheitsrichtlinie hat den Versuch des Verbindungsaufbaus verhindert. Sie m\u00fcssen wahrscheinlich der Verbindung zum Datenbankrechner java.net.SocketPermission gew\u00e4hren, um den Rechner auf dem gew\u00e4hlten Port zu erreichen.";
+    t[723] = "Ihre Sicherheitsrichtlinie hat den Versuch des Verbindungsaufbaus verhindert. Sie müssen wahrscheinlich der Verbindung zum Datenbankrechner java.net.SocketPermission gewähren, um den Rechner auf dem gewählten Port zu erreichen.";
     t[728] = "Failed to initialize LargeObject API";
     t[729] = "Die LargeObject-API konnte nicht initialisiert werden.";
     t[736] = "{0} function takes one and only one argument.";
@@ -263,37 +263,37 @@
     t[744] = "This ResultSet is closed.";
     t[745] = "Dieses ResultSet ist geschlossen.";
     t[746] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[747] = "Ung\u00fcltige Zeichendaten.  Das ist h\u00f6chstwahrscheinlich von in der Datenbank gespeicherten Zeichen hervorgerufen, die in einer anderen Kodierung vorliegen, als die, in der die Datenbank erstellt wurde.  Das h\u00e4ufigste Beispiel daf\u00fcr ist es, 8Bit-Daten in SQL_ASCII-Datenbanken abzulegen.";
+    t[747] = "Ungültige Zeichendaten.  Das ist höchstwahrscheinlich von in der Datenbank gespeicherten Zeichen hervorgerufen, die in einer anderen Kodierung vorliegen, als die, in der die Datenbank erstellt wurde.  Das häufigste Beispiel dafür ist es, 8Bit-Daten in SQL_ASCII-Datenbanken abzulegen.";
     t[752] = "Error disabling autocommit";
     t[753] = "Fehler beim Abschalten von Autocommit.";
     t[754] = "Ran out of memory retrieving query results.";
-    t[755] = "Nicht gen\u00fcgend Speicher beim Abholen der Abfrageergebnisse.";
+    t[755] = "Nicht genügend Speicher beim Abholen der Abfrageergebnisse.";
     t[756] = "Returning autogenerated keys is not supported.";
-    t[757] = "Die R\u00fcckgabe automatisch generierter Schl\u00fcssel wird nicht unterst\u00fctzt,";
+    t[757] = "Die Rückgabe automatisch generierter Schlüssel wird nicht unterstützt,";
     t[760] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
     t[761] = "Die Operation erfordert ein scrollbares ResultSet, dieses jedoch ist FORWARD_ONLY.";
     t[762] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[763] = "Eine CallableStatement-Funktion wurde ausgef\u00fchrt und der R\u00fcckgabewert {0} war vom Typ {1}. Jedoch wurde der Typ {2} daf\u00fcr registriert.";
+    t[763] = "Eine CallableStatement-Funktion wurde ausgeführt und der Rückgabewert {0} war vom Typ {1}. Jedoch wurde der Typ {2} dafür registriert.";
     t[768] = "Unknown ResultSet holdability setting: {0}.";
-    t[769] = "Unbekannte Einstellung f\u00fcr die Haltbarkeit des ResultSets: {0}.";
+    t[769] = "Unbekannte Einstellung für die Haltbarkeit des ResultSets: {0}.";
     t[772] = "Transaction isolation level {0} not supported.";
-    t[773] = "Die Transaktions-Trennungsstufe {0} ist nicht unterst\u00fctzt.";
+    t[773] = "Die Transaktions-Trennungsstufe {0} ist nicht unterstützt.";
     t[774] = "Zero bytes may not occur in identifiers.";
-    t[775] = "Nullbytes d\u00fcrfen in Bezeichnern nicht vorkommen.";
+    t[775] = "Nullbytes dürfen in Bezeichnern nicht vorkommen.";
     t[776] = "No results were returned by the query.";
     t[777] = "Die Abfrage lieferte kein Ergebnis.";
     t[778] = "A CallableStatement was executed with nothing returned.";
-    t[779] = "Ein CallableStatement wurde ausgef\u00fchrt ohne etwas zur\u00fcckzugeben.";
+    t[779] = "Ein CallableStatement wurde ausgeführt ohne etwas zurückzugeben.";
     t[780] = "wasNull cannot be call before fetching a result.";
     t[781] = "wasNull kann nicht aufgerufen werden, bevor ein Ergebnis abgefragt wurde.";
     t[786] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
     t[787] = "Diese Anweisung deklariert keinen OUT-Parameter. Benutzen Sie '{' ?= call ... '}' um das zu tun.";
     t[788] = "Can''t use relative move methods while on the insert row.";
-    t[789] = "Relative Bewegungen k\u00f6nnen in der Einf\u00fcgezeile nicht durchgef\u00fchrt werden.";
+    t[789] = "Relative Bewegungen können in der Einfügezeile nicht durchgeführt werden.";
     t[790] = "A CallableStatement was executed with an invalid number of parameters";
-    t[791] = "Ein CallableStatement wurde mit einer falschen Anzahl Parameter ausgef\u00fchrt.";
+    t[791] = "Ein CallableStatement wurde mit einer falschen Anzahl Parameter ausgeführt.";
     t[792] = "Connection is busy with another transaction";
-    t[793] = "Die Verbindung ist derzeit mit einer anderen Transaktion besch\u00e4ftigt.";
+    t[793] = "Die Verbindung ist derzeit mit einer anderen Transaktion beschäftigt.";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_es.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_es.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_es.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_es.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,39 +5,39 @@
   static {
     java.lang.String[] t = new java.lang.String[74];
     t[0] = "";
-    t[1] = "Project-Id-Version: JDBC PostgreSQL Driver\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2004-10-22 16:51-0300\nLast-Translator: Diego Gil <diego@adminsa.com>\nLanguage-Team: \nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Spanish\n";
+    t[1] = "Project-Id-Version: JDBC PostgreSQL Driver\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2004-10-22 16:51-0300\nLast-Translator: Diego Gil <diego@adminsa.com>\nLanguage-Team: \nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Spanish\n";
     t[4] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[5] = "El \u00edndice de la columna est\u00e1 fuera de rango: {0}, n\u00famero de columnas: {1}.";
+    t[5] = "El índice de la columna está fuera de rango: {0}, número de columnas: {1}.";
     t[12] = "Unknown Response Type {0}.";
     t[13] = "Tipo de respuesta desconocida {0}.";
     t[16] = "Protocol error.  Session setup failed.";
-    t[17] = "Error de protocolo. Fall\u00f3 el inicio de la sesi\u00f3n.";
+    t[17] = "Error de protocolo. Falló el inicio de la sesión.";
     t[20] = "The server requested password-based authentication, but no password was provided.";
-    t[21] = "El servidor requiere autenticaci\u00f3n basada en contrase\u00f1a, pero no se ha provisto ninguna contrase\u00f1a.";
+    t[21] = "El servidor requiere autenticación basada en contraseña, pero no se ha provisto ninguna contraseña.";
     t[26] = "A result was returned when none was expected.";
-    t[27] = "Se retorn\u00f3 un resultado cuando no se esperaba ninguno.";
+    t[27] = "Se retornó un resultado cuando no se esperaba ninguno.";
     t[28] = "Server SQLState: {0}";
     t[29] = "SQLState del servidor: {0}.";
     t[30] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[31] = "El \u00edndice del arreglo esta fuera de rango: {0}, n\u00famero de elementos: {1}.";
+    t[31] = "El índice del arreglo esta fuera de rango: {0}, número de elementos: {1}.";
     t[32] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
     t[33] = "Final prematuro del flujo de entrada, se esperaban {0} bytes, pero solo se leyeron {1}.";
     t[36] = "The connection attempt failed.";
-    t[37] = "El intento de conexi\u00f3n fall\u00f3.";
+    t[37] = "El intento de conexión falló.";
     t[38] = "Failed to create object for: {0}.";
     t[39] = "Fallo al crear objeto: {0}.";
     t[42] = "An error occurred while setting up the SSL connection.";
-    t[43] = "Ha ocorrido un error mientras se establec\u00eda la conexi\u00f3n SSL.";
+    t[43] = "Ha ocorrido un error mientras se establecía la conexión SSL.";
     t[48] = "No value specified for parameter {0}.";
-    t[49] = "No se ha especificado un valor para el par\u00e1metro {0}.";
+    t[49] = "No se ha especificado un valor para el parámetro {0}.";
     t[50] = "The server does not support SSL.";
     t[51] = "Este servidor no soporta SSL.";
     t[52] = "An unexpected result was returned by a query.";
-    t[53] = "Una consulta retorn\u00f3 un resultado inesperado.";
+    t[53] = "Una consulta retornó un resultado inesperado.";
     t[60] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[61] = "Algo inusual ha ocurrido que provoc\u00f3 un fallo en el controlador. Por favor reporte esta excepci\u00f3n.";
+    t[61] = "Algo inusual ha ocurrido que provocó un fallo en el controlador. Por favor reporte esta excepción.";
     t[64] = "No results were returned by the query.";
-    t[65] = "La consulta no retorn\u00f3 ning\u00fan resultado.";
+    t[65] = "La consulta no retornó ningún resultado.";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_fr.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_fr.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_fr.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_fr.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,97 +5,97 @@
   static {
     java.lang.String[] t = new java.lang.String[794];
     t[0] = "";
-    t[1] = "Project-Id-Version: head-fr\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2007-07-27 12:27+0200\nLast-Translator: \nLanguage-Team:  <en@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.11.4\nPlural-Forms:  nplurals=2; plural=(n > 1);\n";
+    t[1] = "Project-Id-Version: head-fr\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2007-07-27 12:27+0200\nLast-Translator: \nLanguage-Team:  <en@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.11.4\nPlural-Forms:  nplurals=2; plural=(n > 1);\n";
     t[4] = "DataSource has been closed.";
-    t[5] = "DataSource a \u00e9t\u00e9 ferm\u00e9e.";
+    t[5] = "DataSource a été fermée.";
     t[18] = "Where: {0}";
-    t[19] = "O\u00f9\u00a0: {0}";
+    t[19] = "Où : {0}";
     t[26] = "The connection attempt failed.";
-    t[27] = "La tentative de connexion a \u00e9chou\u00e9.";
+    t[27] = "La tentative de connexion a échoué.";
     t[28] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[29] = "Actuellement positionn\u00e9 apr\u00e8s la fin du ResultSet. Vous ne pouvez pas appeler deleteRow() ici.";
+    t[29] = "Actuellement positionné après la fin du ResultSet. Vous ne pouvez pas appeler deleteRow() ici.";
     t[32] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[33] = "Impossible d''utiliser les fonctions de requ\u00eate qui utilisent une cha\u00eene de caract\u00e8res sur un PreparedStatement.";
+    t[33] = "Impossible d''utiliser les fonctions de requête qui utilisent une chaîne de caractères sur un PreparedStatement.";
     t[36] = "Multiple ResultSets were returned by the query.";
-    t[37] = "Plusieurs ResultSets ont \u00e9t\u00e9 retourn\u00e9s par la requ\u00eate.";
+    t[37] = "Plusieurs ResultSets ont été retournés par la requête.";
     t[50] = "Too many update results were returned.";
-    t[51] = "Trop de r\u00e9sultats de mise \u00e0 jour ont \u00e9t\u00e9 retourn\u00e9s.";
+    t[51] = "Trop de résultats de mise à jour ont été retournés.";
     t[58] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[59] = "S\u00e9quence UTF-8 ill\u00e9gale: le premier octet est {0}: {1}";
+    t[59] = "Séquence UTF-8 illégale: le premier octet est {0}: {1}";
     t[66] = "The column name {0} was not found in this ResultSet.";
-    t[67] = "Le nom de colonne {0} n''a pas \u00e9t\u00e9 trouv\u00e9 dans ce ResultSet.";
+    t[67] = "Le nom de colonne {0} n''a pas été trouvé dans ce ResultSet.";
     t[70] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[71] = "Appel Fastpath {0} - Aucun r\u00e9sultat n''a \u00e9t\u00e9 retourn\u00e9 et nous attendions un entier.";
+    t[71] = "Appel Fastpath {0} - Aucun résultat n''a été retourné et nous attendions un entier.";
     t[74] = "Protocol error.  Session setup failed.";
-    t[75] = "Erreur de protocole. Ouverture de la session en \u00e9chec.";
+    t[75] = "Erreur de protocole. Ouverture de la session en échec.";
     t[76] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[77] = "Un CallableStatement a \u00e9t\u00e9 d\u00e9clar\u00e9, mais aucun appel \u00e0 registerOutParameter(1, <un type>) n''a \u00e9t\u00e9 fait.";
+    t[77] = "Un CallableStatement a été déclaré, mais aucun appel à registerOutParameter(1, <un type>) n''a été fait.";
     t[78] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[79] = "Les ResultSets avec la concurrence CONCUR_READ_ONLY ne peuvent \u00eatre mis \u00e0 jour.";
+    t[79] = "Les ResultSets avec la concurrence CONCUR_READ_ONLY ne peuvent être mis à jour.";
     t[90] = "LOB positioning offsets start at 1.";
-    t[91] = "Les d\u00e9calages de position des LOB commencent \u00e0 1.";
+    t[91] = "Les décalages de position des LOB commencent à 1.";
     t[92] = "Internal Position: {0}";
-    t[93] = "Position interne\u00a0: {0}";
+    t[93] = "Position interne : {0}";
     t[96] = "free() was called on this LOB previously";
-    t[97] = "free() a \u00e9t\u00e9 appel\u00e9e auparavant sur ce LOB";
+    t[97] = "free() a été appelée auparavant sur ce LOB";
     t[100] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[101] = "Impossible de changer la propri\u00e9t\u00e9 read-only d''une transaction au milieu d''une transaction.";
+    t[101] = "Impossible de changer la propriété read-only d''une transaction au milieu d''une transaction.";
     t[102] = "The JVM claims not to support the {0} encoding.";
-    t[103] = "La JVM pr\u00e9tend ne pas supporter l''encodage {0}.";
+    t[103] = "La JVM prétend ne pas supporter l''encodage {0}.";
     t[108] = "{0} function doesn''t take any argument.";
     t[109] = "La fonction {0} n''accepte aucun argument.";
     t[112] = "xid must not be null";
-    t[113] = "xid ne doit pas \u00eatre nul";
+    t[113] = "xid ne doit pas être nul";
     t[114] = "Connection has been closed.";
-    t[115] = "La connexion a \u00e9t\u00e9 ferm\u00e9e.";
+    t[115] = "La connexion a été fermée.";
     t[122] = "The server does not support SSL.";
     t[123] = "Le serveur ne supporte pas SSL.";
     t[140] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[141] = "S\u00e9quence UTF-8 ill\u00e9gale: l''octet {0} de la s\u00e9quence d''octet {1} n''est pas 10xxxxxx: {2}";
+    t[141] = "Séquence UTF-8 illégale: l''octet {0} de la séquence d''octet {1} n''est pas 10xxxxxx: {2}";
     t[148] = "Hint: {0}";
-    t[149] = "Indice\u00a0: {0}";
+    t[149] = "Indice : {0}";
     t[152] = "Unable to find name datatype in the system catalogs.";
-    t[153] = "Incapable de trouver le type de donn\u00e9e name dans les catalogues syst\u00e8mes.";
+    t[153] = "Incapable de trouver le type de donnée name dans les catalogues systèmes.";
     t[156] = "Unsupported Types value: {0}";
-    t[157] = "Valeur de type non support\u00e9e\u00a0: {0}";
+    t[157] = "Valeur de type non supportée : {0}";
     t[158] = "Unknown type {0}.";
-    t[159] = "Type inconnu\u00a0: {0}.";
+    t[159] = "Type inconnu : {0}.";
     t[166] = "{0} function takes two and only two arguments.";
     t[167] = "La fonction {0} n''accepte que deux et seulement deux arguments.";
     t[170] = "Finalizing a Connection that was never closed:";
-    t[171] = "Destruction d''une connection qui n''a jamais \u00e9t\u00e9 ferm\u00e9e:";
+    t[171] = "Destruction d''une connection qui n''a jamais été fermée:";
     t[180] = "The maximum field size must be a value greater than or equal to 0.";
-    t[181] = "La taille maximum des champs doit \u00eatre une valeur sup\u00e9rieure ou \u00e9gale \u00e0 0.";
+    t[181] = "La taille maximum des champs doit être une valeur supérieure ou égale à 0.";
     t[186] = "PostgreSQL LOBs can only index to: {0}";
-    t[187] = "Les LOB PostgreSQL peuvent seulement s''indicer \u00e0: {0}";
+    t[187] = "Les LOB PostgreSQL peuvent seulement s''indicer à: {0}";
     t[194] = "Method {0} is not yet implemented.";
-    t[195] = "La fonction {0} n''est pas encore impl\u00e9ment\u00e9e.";
+    t[195] = "La fonction {0} n''est pas encore implémentée.";
     t[198] = "Error loading default settings from driverconfig.properties";
-    t[199] = "Erreur de chargement des valeurs par d\u00e9faut depuis driverconfig.properties";
+    t[199] = "Erreur de chargement des valeurs par défaut depuis driverconfig.properties";
     t[200] = "Results cannot be retrieved from a CallableStatement before it is executed.";
-    t[201] = "Les r\u00e9sultats ne peuvent \u00eatre r\u00e9cup\u00e9r\u00e9s \u00e0 partir d''un CallableStatement avant qu''il ne soit ex\u00e9cut\u00e9.";
+    t[201] = "Les résultats ne peuvent être récupérés à partir d''un CallableStatement avant qu''il ne soit exécuté.";
     t[202] = "Large Objects may not be used in auto-commit mode.";
-    t[203] = "Les Large Objects ne devraient pas \u00eatre utilis\u00e9s en mode auto-commit.";
+    t[203] = "Les Large Objects ne devraient pas être utilisés en mode auto-commit.";
     t[208] = "Expected command status BEGIN, got {0}.";
     t[209] = "Attendait le statut de commande BEGIN, obtenu {0}.";
     t[218] = "Invalid fetch direction constant: {0}.";
-    t[219] = "Constante de direction pour la r\u00e9cup\u00e9ration invalide\u00a0: {0}.";
+    t[219] = "Constante de direction pour la récupération invalide : {0}.";
     t[222] = "{0} function takes three and only three arguments.";
     t[223] = "La fonction {0} n''accepte que trois et seulement trois arguments.";
     t[226] = "Error during recover";
     t[227] = "Erreur durant la restauration";
     t[228] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[229] = "Impossible de mettre \u00e0 jour le ResultSet car c''est soit avant le d\u00e9but ou apr\u00e8s la fin des r\u00e9sultats.";
+    t[229] = "Impossible de mettre à jour le ResultSet car c''est soit avant le début ou après la fin des résultats.";
     t[232] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[233] = "Un param\u00e8tre de type {0} a \u00e9t\u00e9 enregistr\u00e9, mais un appel \u00e0 get{1} (sqltype={2}) a \u00e9t\u00e9 fait.";
+    t[233] = "Un paramètre de type {0} a été enregistré, mais un appel à get{1} (sqltype={2}) a été fait.";
     t[240] = "Cannot establish a savepoint in auto-commit mode.";
-    t[241] = "Impossible d''\u00e9tablir un savepoint en mode auto-commit.";
+    t[241] = "Impossible d''établir un savepoint en mode auto-commit.";
     t[242] = "Cannot retrieve the id of a named savepoint.";
-    t[243] = "Impossible de retrouver l''identifiant d''un savepoint nomm\u00e9.";
+    t[243] = "Impossible de retrouver l''identifiant d''un savepoint nommé.";
     t[244] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[245] = "L''indice de la colonne est hors limite\u00a0: {0}, nombre de colonnes\u00a0: {1}.";
+    t[245] = "L''indice de la colonne est hors limite : {0}, nombre de colonnes : {1}.";
     t[250] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[251] = "Quelque chose d''inhabituel a provoqu\u00e9 l''\u00e9chec du pilote. Veuillez faire un rapport sur cette erreur.";
+    t[251] = "Quelque chose d''inhabituel a provoqué l''échec du pilote. Veuillez faire un rapport sur cette erreur.";
     t[260] = "Cannot cast an instance of {0} to type {1}";
     t[261] = "Impossible de convertir une instance de {0} vers le type {1}";
     t[264] = "Unknown Types value.";
@@ -105,195 +105,195 @@
     t[272] = "Cannot retrieve the name of an unnamed savepoint.";
     t[273] = "Impossible de retrouver le nom d''un savepoint sans nom.";
     t[274] = "Unable to translate data into the desired encoding.";
-    t[275] = "Impossible de traduire les donn\u00e9es dans l''encodage d\u00e9sir\u00e9.";
+    t[275] = "Impossible de traduire les données dans l''encodage désiré.";
     t[276] = "Expected an EOF from server, got: {0}";
-    t[277] = "Attendait une fin de fichier du serveur, re\u00e7u: {0}";
+    t[277] = "Attendait une fin de fichier du serveur, reçu: {0}";
     t[278] = "Bad value for type {0} : {1}";
-    t[279] = "Mauvaise valeur pour le type {0}\u00a0: {1}";
+    t[279] = "Mauvaise valeur pour le type {0} : {1}";
     t[280] = "The server requested password-based authentication, but no password was provided.";
-    t[281] = "Le serveur a demand\u00e9 une authentification par mots de passe, mais aucun mot de passe n''a \u00e9t\u00e9 fourni.";
+    t[281] = "Le serveur a demandé une authentification par mots de passe, mais aucun mot de passe n''a été fourni.";
     t[296] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[297] = "Le troncage des large objects n''est impl\u00e9ment\u00e9 que dans les serveurs 8.3 et sup\u00e9rieurs.";
+    t[297] = "Le troncage des large objects n''est implémenté que dans les serveurs 8.3 et supérieurs.";
     t[298] = "This PooledConnection has already been closed.";
-    t[299] = "Cette PooledConnection a d\u00e9j\u00e0 \u00e9t\u00e9 ferm\u00e9e.";
+    t[299] = "Cette PooledConnection a déjà été fermée.";
     t[306] = "Fetch size must be a value greater to or equal to 0.";
-    t[307] = "Fetch size doit \u00eatre une valeur sup\u00e9rieur ou \u00e9gal \u00e0 0.";
+    t[307] = "Fetch size doit être une valeur supérieur ou égal à 0.";
     t[312] = "A connection could not be made using the requested protocol {0}.";
-    t[313] = "Aucune connexion n''a pu \u00eatre \u00e9tablie en utilisant le protocole demand\u00e9 {0}. ";
+    t[313] = "Aucune connexion n''a pu être établie en utilisant le protocole demandé {0}. ";
     t[322] = "There are no rows in this ResultSet.";
     t[323] = "Il n''y pas pas de lignes dans ce ResultSet.";
     t[324] = "Unexpected command status: {0}.";
-    t[325] = "Statut de commande inattendu\u00a0: {0}.";
+    t[325] = "Statut de commande inattendu : {0}.";
     t[334] = "Not on the insert row.";
     t[335] = "Pas sur la ligne en insertion.";
     t[344] = "Server SQLState: {0}";
-    t[345] = "SQLState serveur\u00a0: {0}";
+    t[345] = "SQLState serveur : {0}";
     t[348] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
-    t[349] = "Le param\u00e8tre serveur standard_conforming_strings a pour valeur {0}. Le driver JDBC attend on ou off.";
+    t[349] = "Le paramètre serveur standard_conforming_strings a pour valeur {0}. Le driver JDBC attend on ou off.";
     t[360] = "The driver currently does not support COPY operations.";
-    t[361] = "Le pilote ne supporte pas actuellement les op\u00e9rations COPY.";
+    t[361] = "Le pilote ne supporte pas actuellement les opérations COPY.";
     t[364] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[365] = "L''indice du tableau est hors limites\u00a0: {0}, nombre d''\u00e9l\u00e9ments\u00a0: {1}.";
+    t[365] = "L''indice du tableau est hors limites : {0}, nombre d''éléments : {1}.";
     t[374] = "suspend/resume not implemented";
-    t[375] = "suspend/resume pas impl\u00e9ment\u00e9";
+    t[375] = "suspend/resume pas implémenté";
     t[378] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
-    t[379] = "Pas impl\u00e9ment\u00e9: le commit \u00e0 une phase doit avoir lieu en utilisant la m\u00eame connection que celle o\u00f9 il a commenc\u00e9";
+    t[379] = "Pas implémenté: le commit à une phase doit avoir lieu en utilisant la même connection que celle où il a commencé";
     t[398] = "Cannot call cancelRowUpdates() when on the insert row.";
     t[399] = "Impossible d''appeler cancelRowUpdates() pendant l''insertion d''une ligne.";
     t[400] = "Cannot reference a savepoint after it has been released.";
-    t[401] = "Impossible de r\u00e9f\u00e9rencer un savepoint apr\u00e8s qu''il ait \u00e9t\u00e9 lib\u00e9r\u00e9.";
+    t[401] = "Impossible de référencer un savepoint après qu''il ait été libéré.";
     t[402] = "You must specify at least one column value to insert a row.";
-    t[403] = "Vous devez sp\u00e9cifier au moins une valeur de colonne pour ins\u00e9rer une ligne.";
+    t[403] = "Vous devez spécifier au moins une valeur de colonne pour insérer une ligne.";
     t[404] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[405] = "Incapable de d\u00e9terminer la valeur de MaxIndexKeys en raison de donn\u00e9es manquante dans lecatalogue syst\u00e8me.";
+    t[405] = "Incapable de déterminer la valeur de MaxIndexKeys en raison de données manquante dans lecatalogue système.";
     t[412] = "The JVM claims not to support the encoding: {0}";
-    t[413] = "La JVM pr\u00e9tend ne pas supporter l''encodage: {0}";
+    t[413] = "La JVM prétend ne pas supporter l''encodage: {0}";
     t[414] = "{0} function takes two or three arguments.";
     t[415] = "La fonction {0} n''accepte que deux ou trois arguments.";
     t[440] = "Unexpected error writing large object to database.";
-    t[441] = "Erreur inattendue pendant l''\u00e9criture de large object dans la base.";
+    t[441] = "Erreur inattendue pendant l''écriture de large object dans la base.";
     t[442] = "Zero bytes may not occur in string parameters.";
-    t[443] = "Z\u00e9ro octets ne devrait pas se produire dans les param\u00e8tres de type cha\u00eene de caract\u00e8res.";
+    t[443] = "Zéro octets ne devrait pas se produire dans les paramètres de type chaîne de caractères.";
     t[444] = "A result was returned when none was expected.";
-    t[445] = "Un r\u00e9sultat a \u00e9t\u00e9 retourn\u00e9 alors qu''aucun n''\u00e9tait attendu.";
+    t[445] = "Un résultat a été retourné alors qu''aucun n''était attendu.";
     t[450] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[451] = "Le ResultSet n''est pas modifiable. La requ\u00eate qui a g\u00e9n\u00e9r\u00e9 ce r\u00e9sultat doit s\u00e9lectionner seulement une table, et doit s\u00e9lectionner toutes les cl\u00e9s primaires de cette table. Voir la sp\u00e9cification de l''API JDBC 2.1, section 5.6 pour plus de d\u00e9tails.";
+    t[451] = "Le ResultSet n''est pas modifiable. La requête qui a généré ce résultat doit sélectionner seulement une table, et doit sélectionner toutes les clés primaires de cette table. Voir la spécification de l''API JDBC 2.1, section 5.6 pour plus de détails.";
     t[454] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[455] = "La longueur du message de liaison {0} est trop grande. Cela peut \u00eatre caus\u00e9 par des sp\u00e9cification de longueur tr\u00e8s grandes ou incorrectes pour les param\u00e8tres de type InputStream.";
+    t[455] = "La longueur du message de liaison {0} est trop grande. Cela peut être causé par des spécification de longueur très grandes ou incorrectes pour les paramètres de type InputStream.";
     t[460] = "Statement has been closed.";
-    t[461] = "Statement a \u00e9t\u00e9 ferm\u00e9.";
+    t[461] = "Statement a été fermé.";
     t[462] = "No value specified for parameter {0}.";
-    t[463] = "Pas de valeur sp\u00e9cifi\u00e9e pour le param\u00e8tre {0}.";
+    t[463] = "Pas de valeur spécifiée pour le paramètre {0}.";
     t[468] = "The array index is out of range: {0}";
-    t[469] = "L''indice du tableau est hors limites\u00a0: {0}";
+    t[469] = "L''indice du tableau est hors limites : {0}";
     t[474] = "Unable to bind parameter values for statement.";
-    t[475] = "Incapable de lier les valeurs des param\u00e8tres pour la commande.";
+    t[475] = "Incapable de lier les valeurs des paramètres pour la commande.";
     t[476] = "Can''t refresh the insert row.";
-    t[477] = "Impossible de rafra\u00eechir la ligne ins\u00e9r\u00e9e.";
+    t[477] = "Impossible de rafraîchir la ligne insérée.";
     t[480] = "No primary key found for table {0}.";
-    t[481] = "Pas de cl\u00e9 primaire trouv\u00e9e pour la table {0}.";
+    t[481] = "Pas de clé primaire trouvée pour la table {0}.";
     t[482] = "Cannot change transaction isolation level in the middle of a transaction.";
     t[483] = "Impossible de changer le niveau d''isolation des transactions au milieu d''une transaction.";
     t[498] = "Provided InputStream failed.";
-    t[499] = "L''InputStream fourni a \u00e9chou\u00e9.";
+    t[499] = "L''InputStream fourni a échoué.";
     t[500] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[501] = "L''indice du param\u00e8tre est hors limites\u00a0: {0}, nombre de param\u00e8tres\u00a0: {1}.";
+    t[501] = "L''indice du paramètre est hors limites : {0}, nombre de paramètres : {1}.";
     t[502] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[503] = "Le param\u00e8tre DateStyle du serveur a \u00e9t\u00e9 chang\u00e9 pour {0}. Le pilote JDBC n\u00e9cessite que DateStyle commence par ISO pour un fonctionnement correct.";
+    t[503] = "Le paramètre DateStyle du serveur a été changé pour {0}. Le pilote JDBC nécessite que DateStyle commence par ISO pour un fonctionnement correct.";
     t[508] = "Connection attempt timed out.";
-    t[509] = "La tentative de connexion a \u00e9chou\u00e9 dans le d\u00e9lai imparti.";
+    t[509] = "La tentative de connexion a échoué dans le délai imparti.";
     t[512] = "Internal Query: {0}";
-    t[513] = "Requ\u00eate interne: {0}";
+    t[513] = "Requête interne: {0}";
     t[518] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[519] = "Le type d''authentification {0} n''est pas support\u00e9. V\u00e9rifiez que vous avez configur\u00e9 le fichier pg_hba.conf pour inclure l''adresse IP du client ou le sous-r\u00e9seau et qu''il utilise un sch\u00e9ma d''authentification support\u00e9 par le pilote.";
+    t[519] = "Le type d''authentification {0} n''est pas supporté. Vérifiez que vous avez configuré le fichier pg_hba.conf pour inclure l''adresse IP du client ou le sous-réseau et qu''il utilise un schéma d''authentification supporté par le pilote.";
     t[526] = "Interval {0} not yet implemented";
-    t[527] = "L''interval {0} n''est pas encore impl\u00e9ment\u00e9";
+    t[527] = "L''interval {0} n''est pas encore implémenté";
     t[532] = "Conversion of interval failed";
-    t[533] = "La conversion de l''intervalle a \u00e9chou\u00e9";
+    t[533] = "La conversion de l''intervalle a échoué";
     t[540] = "Query timeout must be a value greater than or equals to 0.";
-    t[541] = "Query timeout doit \u00eatre une valeur sup\u00e9rieure ou \u00e9gale \u00e0 0.";
+    t[541] = "Query timeout doit être une valeur supérieure ou égale à 0.";
     t[542] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[543] = "La connexion a \u00e9t\u00e9 ferm\u00e9e automatiquement car une nouvelle connexion a \u00e9t\u00e9 ouverte pour la m\u00eame PooledConnection ou la PooledConnection a \u00e9t\u00e9 ferm\u00e9e.";
+    t[543] = "La connexion a été fermée automatiquement car une nouvelle connexion a été ouverte pour la même PooledConnection ou la PooledConnection a été fermée.";
     t[544] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[545] = "Le ResultSet n''est pas positionn\u00e9 correctement, vous devez peut-\u00eatre appeler next().";
+    t[545] = "Le ResultSet n''est pas positionné correctement, vous devez peut-être appeler next().";
     t[550] = "This statement has been closed.";
-    t[551] = "Ce statement a \u00e9t\u00e9 ferm\u00e9.";
+    t[551] = "Ce statement a été fermé.";
     t[552] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[553] = "Impossible de d\u00e9duire le type SQL \u00e0 utiliser pour une instance de {0}. Utilisez setObject() avec une valeur de type explicite pour sp\u00e9cifier le type \u00e0 utiliser.";
+    t[553] = "Impossible de déduire le type SQL à utiliser pour une instance de {0}. Utilisez setObject() avec une valeur de type explicite pour spécifier le type à utiliser.";
     t[554] = "Cannot call updateRow() when on the insert row.";
-    t[555] = "Impossible d''appeler updateRow() tant que l''on est sur la ligne ins\u00e9r\u00e9e.";
+    t[555] = "Impossible d''appeler updateRow() tant que l''on est sur la ligne insérée.";
     t[562] = "Detail: {0}";
-    t[563] = "D\u00e9tail\u00a0: {0}";
+    t[563] = "Détail : {0}";
     t[566] = "Cannot call deleteRow() when on the insert row.";
     t[567] = "Impossible d''appeler deleteRow() pendant l''insertion d''une ligne.";
     t[568] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[569] = "Actuellement positionn\u00e9 avant le d\u00e9but du ResultSet. Vous ne pouvez pas appeler deleteRow() ici.";
+    t[569] = "Actuellement positionné avant le début du ResultSet. Vous ne pouvez pas appeler deleteRow() ici.";
     t[576] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[577] = "S\u00e9quence UTF-8 ill\u00e9gale: la valeur finale est une valeur de remplacement: {0}";
+    t[577] = "Séquence UTF-8 illégale: la valeur finale est une valeur de remplacement: {0}";
     t[578] = "Unknown Response Type {0}.";
-    t[579] = "Type de r\u00e9ponse inconnu {0}.";
+    t[579] = "Type de réponse inconnu {0}.";
     t[582] = "Unsupported value for stringtype parameter: {0}";
-    t[583] = "Valeur non support\u00e9e pour les param\u00e8tre de type cha\u00eene de caract\u00e8res\u00a0: {0}";
+    t[583] = "Valeur non supportée pour les paramètre de type chaîne de caractères : {0}";
     t[584] = "Conversion to type {0} failed: {1}.";
-    t[585] = "La conversion vers le type {0} a \u00e9chou\u00e9\u00a0: {1}.";
+    t[585] = "La conversion vers le type {0} a échoué : {1}.";
     t[586] = "Conversion of money failed.";
-    t[587] = "La conversion de money a \u00e9chou\u00e9.";
+    t[587] = "La conversion de money a échoué.";
     t[600] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[601] = "Incapable de charger la classe {0} responsable du type de donn\u00e9es {1}";
+    t[601] = "Incapable de charger la classe {0} responsable du type de données {1}";
     t[604] = "The fastpath function {0} is unknown.";
     t[605] = "La fonction fastpath {0} est inconnue.";
     t[608] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[609] = "Syntaxe de fonction ou d''\u00e9chappement de proc\u00e9dure malform\u00e9e \u00e0 l''indice {0}.";
+    t[609] = "Syntaxe de fonction ou d''échappement de procédure malformée à l''indice {0}.";
     t[612] = "Provided Reader failed.";
-    t[613] = "Le Reader fourni a \u00e9chou\u00e9.";
+    t[613] = "Le Reader fourni a échoué.";
     t[614] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[615] = "Le nombre maximum de lignes doit \u00eatre une valeur sup\u00e9rieure ou \u00e9gale \u00e0 0.";
+    t[615] = "Le nombre maximum de lignes doit être une valeur supérieure ou égale à 0.";
     t[616] = "Failed to create object for: {0}.";
-    t[617] = "\u00c9chec \u00e0 la cr\u00e9ation de l''objet pour\u00a0: {0}.";
+    t[617] = "Échec à la création de l''objet pour : {0}.";
     t[622] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[623] = "Fin pr\u00e9matur\u00e9e du flux en entr\u00e9e, {0} octets attendus, mais seulement {1} lus.";
+    t[623] = "Fin prématurée du flux en entrée, {0} octets attendus, mais seulement {1} lus.";
     t[626] = "An unexpected result was returned by a query.";
-    t[627] = "Un r\u00e9sultat inattendu a \u00e9t\u00e9 retourn\u00e9 par une requ\u00eate.";
+    t[627] = "Un résultat inattendu a été retourné par une requête.";
     t[646] = "An error occurred while setting up the SSL connection.";
-    t[647] = "Une erreur s''est produite pendant l''\u00e9tablissement de la connexion SSL.";
+    t[647] = "Une erreur s''est produite pendant l''établissement de la connexion SSL.";
     t[654] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
-    t[655] = "S\u00e9quence UTF-8 ill\u00e9gale: {0} octets utilis\u00e9 pour encoder une valeur \u00e0 {1} octets: {2}";
+    t[655] = "Séquence UTF-8 illégale: {0} octets utilisé pour encoder une valeur à {1} octets: {2}";
     t[658] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[659] = "La classe SSLSocketFactory fournie {0} n''a pas pu \u00eatre instanci\u00e9e.";
+    t[659] = "La classe SSLSocketFactory fournie {0} n''a pas pu être instanciée.";
     t[670] = "Position: {0}";
-    t[671] = "Position\u00a0: {0}";
+    t[671] = "Position : {0}";
     t[676] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[677] = "Localisation\u00a0: Fichier\u00a0: {0}, Routine\u00a0: {1}, Ligne\u00a0: {2}";
+    t[677] = "Localisation : Fichier : {0}, Routine : {1}, Ligne : {2}";
     t[684] = "Cannot tell if path is open or closed: {0}.";
-    t[685] = "Impossible de dire si path est ferm\u00e9 ou ouvert\u00a0: {0}.";
+    t[685] = "Impossible de dire si path est fermé ou ouvert : {0}.";
     t[700] = "Cannot convert an instance of {0} to type {1}";
     t[701] = "Impossible de convertir une instance de type {0} vers le type {1}";
     t[710] = "{0} function takes four and only four argument.";
     t[711] = "La fonction {0} n''accepte que quatre et seulement quatre arguments.";
     t[718] = "Interrupted while attempting to connect.";
-    t[719] = "Interrompu pendant l''\u00e9tablissement de la connexion.";
+    t[719] = "Interrompu pendant l''établissement de la connexion.";
     t[722] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[723] = "S\u00e9quence UTF-8 ill\u00e9gale: la valeur finale est en dehors des limites: {0}";
+    t[723] = "Séquence UTF-8 illégale: la valeur finale est en dehors des limites: {0}";
     t[728] = "Failed to initialize LargeObject API";
-    t[729] = "\u00c9chec \u00e0 l''initialisation de l''API LargeObject";
+    t[729] = "Échec à l''initialisation de l''API LargeObject";
     t[734] = "No function outputs were registered.";
-    t[735] = "Aucune fonction outputs n''a \u00e9t\u00e9 enregistr\u00e9e.";
+    t[735] = "Aucune fonction outputs n''a été enregistrée.";
     t[736] = "{0} function takes one and only one argument.";
     t[737] = "La fonction {0} n''accepte qu''un et un seul argument.";
     t[744] = "This ResultSet is closed.";
-    t[745] = "Ce ResultSet est ferm\u00e9.";
+    t[745] = "Ce ResultSet est fermé.";
     t[746] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[747] = "Des donn\u00e9es de caract\u00e8res invalides ont \u00e9t\u00e9 trouv\u00e9es. C''est probablement caus\u00e9 par le stockage de caract\u00e8res invalides pour le jeu de caract\u00e8res de cr\u00e9ation de la base. L''exemple le plus courant est le stockage de donn\u00e9es 8bit dans une base SQL_ASCII.";
+    t[747] = "Des données de caractères invalides ont été trouvées. C''est probablement causé par le stockage de caractères invalides pour le jeu de caractères de création de la base. L''exemple le plus courant est le stockage de données 8bit dans une base SQL_ASCII.";
     t[750] = "An I/O error occurred while sending to the backend.";
-    t[751] = "Une erreur d''entr\u00e9e/sortie a eu lieu lors d''envoi vers le serveur.";
+    t[751] = "Une erreur d''entrée/sortie a eu lieu lors d''envoi vers le serveur.";
     t[752] = "Error disabling autocommit";
-    t[753] = "Erreur en d\u00e9sactivant autocommit";
+    t[753] = "Erreur en désactivant autocommit";
     t[754] = "Ran out of memory retrieving query results.";
-    t[755] = "Ai manqu\u00e9 de m\u00e9moire en r\u00e9cup\u00e9rant les r\u00e9sultats de la requ\u00eate.";
+    t[755] = "Ai manqué de mémoire en récupérant les résultats de la requête.";
     t[756] = "Returning autogenerated keys is not supported.";
-    t[757] = "Le renvoi des cl\u00e9s automatiquement g\u00e9n\u00e9r\u00e9es n''est pas support\u00e9.";
+    t[757] = "Le renvoi des clés automatiquement générées n''est pas supporté.";
     t[760] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[761] = "L''op\u00e9ration n\u00e9cessite un scrollable ResultSet, mais ce ResultSet est FORWARD_ONLY.";
+    t[761] = "L''opération nécessite un scrollable ResultSet, mais ce ResultSet est FORWARD_ONLY.";
     t[762] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[763] = "Une fonction CallableStatement a \u00e9t\u00e9 ex\u00e9cut\u00e9e et le param\u00e8tre en sortie {0} \u00e9tait du type {1} alors que le type {2} \u00e9tait pr\u00e9vu.";
+    t[763] = "Une fonction CallableStatement a été exécutée et le paramètre en sortie {0} était du type {1} alors que le type {2} était prévu.";
     t[768] = "Unknown ResultSet holdability setting: {0}.";
-    t[769] = "Param\u00e8tre holdability du ResultSet inconnu\u00a0: {0}.";
+    t[769] = "Paramètre holdability du ResultSet inconnu : {0}.";
     t[772] = "Transaction isolation level {0} not supported.";
-    t[773] = "Le niveau d''isolation de transaction {0} n''est pas support\u00e9.";
+    t[773] = "Le niveau d''isolation de transaction {0} n''est pas supporté.";
     t[774] = "Zero bytes may not occur in identifiers.";
-    t[775] = "Des octects \u00e0 0 ne devraient pas appara\u00eetre dans les identifiants.";
+    t[775] = "Des octects à 0 ne devraient pas apparaître dans les identifiants.";
     t[776] = "No results were returned by the query.";
-    t[777] = "Aucun r\u00e9sultat retourn\u00e9 par la requ\u00eate.";
+    t[777] = "Aucun résultat retourné par la requête.";
     t[778] = "A CallableStatement was executed with nothing returned.";
-    t[779] = "Un CallableStatement a \u00e9t\u00e9 ex\u00e9cut\u00e9 mais n''a rien retourn\u00e9.";
+    t[779] = "Un CallableStatement a été exécuté mais n''a rien retourné.";
     t[780] = "wasNull cannot be call before fetching a result.";
-    t[781] = "wasNull ne peut pas \u00eatre appel\u00e9 avant la r\u00e9cup\u00e9ration d''un r\u00e9sultat.";
+    t[781] = "wasNull ne peut pas être appelé avant la récupération d''un résultat.";
     t[786] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[787] = "Cette requ\u00eate ne d\u00e9clare pas de param\u00e8tre OUT. Utilisez '{' ?= call ... '}' pour en d\u00e9clarer un.";
+    t[787] = "Cette requête ne déclare pas de paramètre OUT. Utilisez '{' ?= call ... '}' pour en déclarer un.";
     t[788] = "Can''t use relative move methods while on the insert row.";
-    t[789] = "Impossible d''utiliser les fonctions de d\u00e9placement relatif pendant l''insertion d''une ligne.";
+    t[789] = "Impossible d''utiliser les fonctions de déplacement relatif pendant l''insertion d''une ligne.";
     t[792] = "Connection is busy with another transaction";
-    t[793] = "La connection est occup\u00e9e avec une autre transaction";
+    t[793] = "La connection est occupée avec une autre transaction";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_it.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_it.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_it.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_it.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,279 +5,279 @@
   static {
     java.lang.String[] t = new java.lang.String[794];
     t[0] = "";
-    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.2\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2006-06-23 17:25+0200\nLast-Translator: Giuseppe Sacco <eppesuig@debian.org>\nLanguage-Team: Italian <tp@lists.linux.it>\nLanguage: it\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
+    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.2\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2006-06-23 17:25+0200\nLast-Translator: Giuseppe Sacco <eppesuig@debian.org>\nLanguage-Team: Italian <tp@lists.linux.it>\nLanguage: it\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
     t[4] = "DataSource has been closed.";
-    t[5] = "Questo \u00abDataSource\u00bb \u00e8 stato chiuso.";
+    t[5] = "Questo «DataSource» è stato chiuso.";
     t[18] = "Where: {0}";
     t[19] = "Dove: {0}";
     t[26] = "The connection attempt failed.";
-    t[27] = "Il tentativo di connessione \u00e8 fallito.";
+    t[27] = "Il tentativo di connessione è fallito.";
     t[28] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[29] = "La posizione attuale \u00e8 successiva alla fine del ResultSet. Non \u00e8 possibile invocare \u00abdeleteRow()\u00bb qui.";
+    t[29] = "La posizione attuale è successiva alla fine del ResultSet. Non è possibile invocare «deleteRow()» qui.";
     t[32] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[33] = "Non si possono utilizzare i metodi \"query\" che hanno come argomento una stringa nel caso di \u00abPreparedStatement\u00bb.";
+    t[33] = "Non si possono utilizzare i metodi \"query\" che hanno come argomento una stringa nel caso di «PreparedStatement».";
     t[36] = "Multiple ResultSets were returned by the query.";
-    t[37] = "La query ha restituito \u00abResultSet\u00bb multipli.";
+    t[37] = "La query ha restituito «ResultSet» multipli.";
     t[50] = "Too many update results were returned.";
     t[51] = "Sono stati restituiti troppi aggiornamenti.";
     t[58] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[59] = "Sequenza UTF-8 illegale: il byte iniziale \u00e8 {0}: {1}";
+    t[59] = "Sequenza UTF-8 illegale: il byte iniziale è {0}: {1}";
     t[66] = "The column name {0} was not found in this ResultSet.";
-    t[67] = "Colonna denominata \u00ab{0}\u00bb non \u00e8 presente in questo \u00abResultSet\u00bb.";
+    t[67] = "Colonna denominata «{0}» non è presente in questo «ResultSet».";
     t[70] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[71] = "Chiamata Fastpath \u00ab{0}\u00bb: Nessun risultato restituito mentre ci si aspettava un intero.";
+    t[71] = "Chiamata Fastpath «{0}»: Nessun risultato restituito mentre ci si aspettava un intero.";
     t[74] = "Protocol error.  Session setup failed.";
     t[75] = "Errore di protocollo. Impostazione della sessione fallita.";
     t[76] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[77] = "\u00c8 stato definito un \u00abCallableStatement\u00bb ma non \u00e8 stato invocato il metodo \u00abregisterOutParameter(1, <tipo>)\u00bb.";
+    t[77] = "È stato definito un «CallableStatement» ma non è stato invocato il metodo «registerOutParameter(1, <tipo>)».";
     t[78] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[79] = "I \u00abResultSet\u00bb in modalit\u00e0 CONCUR_READ_ONLY non possono essere aggiornati.";
+    t[79] = "I «ResultSet» in modalità CONCUR_READ_ONLY non possono essere aggiornati.";
     t[90] = "LOB positioning offsets start at 1.";
     t[91] = "L''offset per la posizione dei LOB comincia da 1.";
     t[92] = "Internal Position: {0}";
     t[93] = "Posizione interna: {0}";
     t[100] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[101] = "Non \u00e8 possibile modificare la propriet\u00e0 \u00abread-only\u00bb delle transazioni nel mezzo di una transazione.";
+    t[101] = "Non è possibile modificare la proprietà «read-only» delle transazioni nel mezzo di una transazione.";
     t[102] = "The JVM claims not to support the {0} encoding.";
     t[103] = "La JVM sostiene di non supportare la codifica {0}.";
     t[108] = "{0} function doesn''t take any argument.";
-    t[109] = "Il metodo \u00ab{0}\u00bb non accetta argomenti.";
+    t[109] = "Il metodo «{0}» non accetta argomenti.";
     t[112] = "xid must not be null";
-    t[113] = "xid non pu\u00f2 essere NULL";
+    t[113] = "xid non può essere NULL";
     t[114] = "Connection has been closed.";
-    t[115] = "Questo \u00abConnection\u00bb \u00e8 stato chiuso.";
+    t[115] = "Questo «Connection» è stato chiuso.";
     t[122] = "The server does not support SSL.";
     t[123] = "Il server non supporta SSL.";
     t[140] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[141] = "Sequenza UTF-8 illegale: il byte {0} di una sequenza di {1} byte non \u00e8 10xxxxxx: {2}";
+    t[141] = "Sequenza UTF-8 illegale: il byte {0} di una sequenza di {1} byte non è 10xxxxxx: {2}";
     t[148] = "Hint: {0}";
     t[149] = "Suggerimento: {0}";
     t[152] = "Unable to find name datatype in the system catalogs.";
-    t[153] = "Non \u00e8 possibile trovare il datatype \u00abname\u00bb nel catalogo di sistema.";
+    t[153] = "Non è possibile trovare il datatype «name» nel catalogo di sistema.";
     t[156] = "Unsupported Types value: {0}";
-    t[157] = "Valore di tipo \u00ab{0}\u00bb non supportato.";
+    t[157] = "Valore di tipo «{0}» non supportato.";
     t[158] = "Unknown type {0}.";
     t[159] = "Tipo sconosciuto {0}.";
     t[166] = "{0} function takes two and only two arguments.";
-    t[167] = "Il metodo \u00ab{0}\u00bb accetta due e solo due argomenti.";
+    t[167] = "Il metodo «{0}» accetta due e solo due argomenti.";
     t[170] = "Finalizing a Connection that was never closed:";
-    t[171] = "Finalizzazione di una \u00abConnection\u00bb che non \u00e8 stata chiusa.";
+    t[171] = "Finalizzazione di una «Connection» che non è stata chiusa.";
     t[186] = "PostgreSQL LOBs can only index to: {0}";
-    t[187] = "Il massimo valore per l''indice dei LOB di PostgreSQL \u00e8 {0}. ";
+    t[187] = "Il massimo valore per l''indice dei LOB di PostgreSQL è {0}. ";
     t[194] = "Method {0} is not yet implemented.";
-    t[195] = "Il metodo \u00ab{0}\u00bb non \u00e8 stato ancora implementato.";
+    t[195] = "Il metodo «{0}» non è stato ancora implementato.";
     t[198] = "Error loading default settings from driverconfig.properties";
-    t[199] = "Si \u00e8 verificato un errore caricando le impostazioni predefinite da \u00abdriverconfig.properties\u00bb.";
+    t[199] = "Si è verificato un errore caricando le impostazioni predefinite da «driverconfig.properties».";
     t[202] = "Large Objects may not be used in auto-commit mode.";
-    t[203] = "Non \u00e8 possibile impostare i \u00abLarge Object\u00bb in modalit\u00e0 \u00abauto-commit\u00bb.";
+    t[203] = "Non è possibile impostare i «Large Object» in modalità «auto-commit».";
     t[208] = "Expected command status BEGIN, got {0}.";
-    t[209] = "Lo stato del comando avrebbe dovuto essere BEGIN, mentre invece \u00e8 {0}.";
+    t[209] = "Lo stato del comando avrebbe dovuto essere BEGIN, mentre invece è {0}.";
     t[218] = "Invalid fetch direction constant: {0}.";
     t[219] = "Costante per la direzione dell''estrazione non valida: {0}.";
     t[222] = "{0} function takes three and only three arguments.";
-    t[223] = "Il metodo \u00ab{0}\u00bb accetta tre e solo tre argomenti.";
+    t[223] = "Il metodo «{0}» accetta tre e solo tre argomenti.";
     t[226] = "Error during recover";
     t[227] = "Errore durante il ripristino";
     t[228] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[229] = "Non \u00e8 possibile aggiornare il \u00abResultSet\u00bb perch\u00e9 la posizione attuale \u00e8 precedente all''inizio o successiva alla file dei risultati.";
+    t[229] = "Non è possibile aggiornare il «ResultSet» perché la posizione attuale è precedente all''inizio o successiva alla file dei risultati.";
     t[232] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[233] = "\u00c8 stato definito il parametro di tipo \u00ab{0}\u00bb, ma poi \u00e8 stato invocato il metodo \u00abget{1}()\u00bb (sqltype={2}).";
+    t[233] = "È stato definito il parametro di tipo «{0}», ma poi è stato invocato il metodo «get{1}()» (sqltype={2}).";
     t[240] = "Cannot establish a savepoint in auto-commit mode.";
-    t[241] = "Non \u00e8 possibile impostare i punti di ripristino in modalit\u00e0 \u00abauto-commit\u00bb.";
+    t[241] = "Non è possibile impostare i punti di ripristino in modalità «auto-commit».";
     t[242] = "Cannot retrieve the id of a named savepoint.";
-    t[243] = "Non \u00e8 possibile trovare l''id del punto di ripristino indicato.";
+    t[243] = "Non è possibile trovare l''id del punto di ripristino indicato.";
     t[244] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[245] = "Indice di colonna, {0}, \u00e8 maggiore del numero di colonne {1}.";
+    t[245] = "Indice di colonna, {0}, è maggiore del numero di colonne {1}.";
     t[250] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[251] = "Qualcosa di insolito si \u00e8 verificato causando il fallimento del driver. Per favore riferire all''autore del driver questa eccezione.";
+    t[251] = "Qualcosa di insolito si è verificato causando il fallimento del driver. Per favore riferire all''autore del driver questa eccezione.";
     t[260] = "Cannot cast an instance of {0} to type {1}";
-    t[261] = "Non \u00e8 possibile fare il cast di una istanza di \u00ab{0}\u00bb al tipo \u00ab{1}\u00bb.";
+    t[261] = "Non è possibile fare il cast di una istanza di «{0}» al tipo «{1}».";
     t[264] = "Unknown Types value.";
     t[265] = "Valore di tipo sconosciuto.";
     t[266] = "Invalid stream length {0}.";
-    t[267] = "La dimensione specificata, {0}, per lo \u00abstream\u00bb non \u00e8 valida.";
+    t[267] = "La dimensione specificata, {0}, per lo «stream» non è valida.";
     t[272] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[273] = "Non \u00e8 possibile trovare il nome di un punto di ripristino anonimo.";
+    t[273] = "Non è possibile trovare il nome di un punto di ripristino anonimo.";
     t[274] = "Unable to translate data into the desired encoding.";
     t[275] = "Impossibile tradurre i dati nella codifica richiesta.";
     t[276] = "Expected an EOF from server, got: {0}";
-    t[277] = "Ricevuto dal server \u00ab{0}\u00bb mentre era atteso un EOF";
+    t[277] = "Ricevuto dal server «{0}» mentre era atteso un EOF";
     t[278] = "Bad value for type {0} : {1}";
-    t[279] = "Il valore \u00ab{1}\u00bb non \u00e8 adeguato al tipo \u00ab{0}\u00bb.";
+    t[279] = "Il valore «{1}» non è adeguato al tipo «{0}».";
     t[280] = "The server requested password-based authentication, but no password was provided.";
-    t[281] = "Il server ha richiesto l''autenticazione con password, ma tale password non \u00e8 stata fornita.";
+    t[281] = "Il server ha richiesto l''autenticazione con password, ma tale password non è stata fornita.";
     t[298] = "This PooledConnection has already been closed.";
-    t[299] = "Questo \u00abPooledConnection\u00bb \u00e8 stato chiuso.";
+    t[299] = "Questo «PooledConnection» è stato chiuso.";
     t[306] = "Fetch size must be a value greater to or equal to 0.";
-    t[307] = "La dimensione dell''area di \u00abfetch\u00bb deve essere maggiore o eguale a 0.";
+    t[307] = "La dimensione dell''area di «fetch» deve essere maggiore o eguale a 0.";
     t[312] = "A connection could not be made using the requested protocol {0}.";
-    t[313] = "Non \u00e8 stato possibile attivare la connessione utilizzando il protocollo richiesto {0}.";
+    t[313] = "Non è stato possibile attivare la connessione utilizzando il protocollo richiesto {0}.";
     t[322] = "There are no rows in this ResultSet.";
-    t[323] = "Non ci sono righe in questo \u00abResultSet\u00bb.";
+    t[323] = "Non ci sono righe in questo «ResultSet».";
     t[324] = "Unexpected command status: {0}.";
     t[325] = "Stato del comando non previsto: {0}.";
     t[334] = "Not on the insert row.";
-    t[335] = "Non si \u00e8 in una nuova riga.";
+    t[335] = "Non si è in una nuova riga.";
     t[344] = "Server SQLState: {0}";
     t[345] = "SQLState del server: {0}";
     t[360] = "The driver currently does not support COPY operations.";
-    t[361] = "Il driver non supporta al momento l''operazione \u00abCOPY\u00bb.";
+    t[361] = "Il driver non supporta al momento l''operazione «COPY».";
     t[364] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[365] = "L''indice dell''array \u00e8 fuori intervallo: {0}, numero di elementi: {1}.";
+    t[365] = "L''indice dell''array è fuori intervallo: {0}, numero di elementi: {1}.";
     t[374] = "suspend/resume not implemented";
-    t[375] = "\u00absuspend\u00bb/\u00abresume\u00bb non implementato";
+    t[375] = "«suspend»/«resume» non implementato";
     t[378] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
     t[379] = "Non implementato: il commit \"one-phase\" deve essere invocato sulla stessa connessione che ha iniziato la transazione.";
     t[398] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[399] = "Non \u00e8 possibile invocare \u00abcancelRowUpdates()\u00bb durante l''inserimento di una riga.";
+    t[399] = "Non è possibile invocare «cancelRowUpdates()» durante l''inserimento di una riga.";
     t[400] = "Cannot reference a savepoint after it has been released.";
-    t[401] = "Non \u00e8 possibile utilizzare un punto di ripristino successivamente al suo rilascio.";
+    t[401] = "Non è possibile utilizzare un punto di ripristino successivamente al suo rilascio.";
     t[402] = "You must specify at least one column value to insert a row.";
     t[403] = "Per inserire un record si deve specificare almeno il valore di una colonna.";
     t[404] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[405] = "Non \u00e8 possibile trovare il valore di \u00abMaxIndexKeys\u00bb nel catalogo si sistema.";
+    t[405] = "Non è possibile trovare il valore di «MaxIndexKeys» nel catalogo si sistema.";
     t[412] = "The JVM claims not to support the encoding: {0}";
     t[413] = "La JVM sostiene di non supportare la codifica: {0}.";
     t[414] = "{0} function takes two or three arguments.";
-    t[415] = "Il metodo \u00ab{0}\u00bb accetta due o tre argomenti.";
+    t[415] = "Il metodo «{0}» accetta due o tre argomenti.";
     t[440] = "Unexpected error writing large object to database.";
-    t[441] = "Errore inatteso inviando un \u00ablarge object\u00bb al database.";
+    t[441] = "Errore inatteso inviando un «large object» al database.";
     t[442] = "Zero bytes may not occur in string parameters.";
     t[443] = "Byte con valore zero non possono essere contenuti nei parametri stringa.";
     t[444] = "A result was returned when none was expected.";
-    t[445] = "\u00c8 stato restituito un valore nonostante non ne fosse atteso nessuno.";
+    t[445] = "È stato restituito un valore nonostante non ne fosse atteso nessuno.";
     t[450] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[451] = "Il \u00abResultSet\u00bb non \u00e8 aggiornabile. La query che lo genera deve selezionare una sola tabella e deve selezionarne tutti i campi che ne compongono la chiave primaria. Si vedano le specifiche dell''API JDBC 2.1, sezione 5.6, per ulteriori dettagli.";
+    t[451] = "Il «ResultSet» non è aggiornabile. La query che lo genera deve selezionare una sola tabella e deve selezionarne tutti i campi che ne compongono la chiave primaria. Si vedano le specifiche dell''API JDBC 2.1, sezione 5.6, per ulteriori dettagli.";
     t[454] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[455] = "Il messaggio di \u00abbind\u00bb \u00e8 troppo lungo ({0}). Questo pu\u00f2 essere causato da una dimensione eccessiva o non corretta dei parametri dell''\u00abInputStream\u00bb.";
+    t[455] = "Il messaggio di «bind» è troppo lungo ({0}). Questo può essere causato da una dimensione eccessiva o non corretta dei parametri dell''«InputStream».";
     t[460] = "Statement has been closed.";
-    t[461] = "Questo \u00abStatement\u00bb \u00e8 stato chiuso.";
+    t[461] = "Questo «Statement» è stato chiuso.";
     t[462] = "No value specified for parameter {0}.";
     t[463] = "Nessun valore specificato come parametro {0}.";
     t[468] = "The array index is out of range: {0}";
     t[469] = "Indice di colonna fuori dall''intervallo ammissibile: {0}";
     t[474] = "Unable to bind parameter values for statement.";
-    t[475] = "Impossibile fare il \u00abbind\u00bb dei valori passati come parametri per lo statement.";
+    t[475] = "Impossibile fare il «bind» dei valori passati come parametri per lo statement.";
     t[476] = "Can''t refresh the insert row.";
-    t[477] = "Non \u00e8 possibile aggiornare la riga in inserimento.";
+    t[477] = "Non è possibile aggiornare la riga in inserimento.";
     t[480] = "No primary key found for table {0}.";
-    t[481] = "Non \u00e8 stata trovata la chiave primaria della tabella \u00ab{0}\u00bb.";
+    t[481] = "Non è stata trovata la chiave primaria della tabella «{0}».";
     t[482] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[483] = "Non \u00e8 possibile cambiare il livello di isolamento delle transazioni nel mezzo di una transazione.";
+    t[483] = "Non è possibile cambiare il livello di isolamento delle transazioni nel mezzo di una transazione.";
     t[498] = "Provided InputStream failed.";
-    t[499] = "L''\u00abInputStream\u00bb fornito \u00e8 fallito.";
+    t[499] = "L''«InputStream» fornito è fallito.";
     t[500] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[501] = "Il parametro indice \u00e8 fuori intervallo: {0}, numero di elementi: {1}.";
+    t[501] = "Il parametro indice è fuori intervallo: {0}, numero di elementi: {1}.";
     t[502] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[503] = "Il parametro del server \u00abDateStyle\u00bb \u00e8 stato cambiato in {0}. Il driver JDBC richiede che \u00abDateStyle\u00bb cominci con \u00abISO\u00bb per un corretto funzionamento.";
+    t[503] = "Il parametro del server «DateStyle» è stato cambiato in {0}. Il driver JDBC richiede che «DateStyle» cominci con «ISO» per un corretto funzionamento.";
     t[508] = "Connection attempt timed out.";
-    t[509] = "Il tentativo di connessione \u00e8 scaduto.";
+    t[509] = "Il tentativo di connessione è scaduto.";
     t[512] = "Internal Query: {0}";
     t[513] = "Query interna: {0}";
     t[518] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[519] = "L''autenticazione di tipo {0} non \u00e8 supportata. Verificare che nel file di configurazione pg_hba.conf sia presente l''indirizzo IP o la sottorete del client, e che lo schema di autenticazione utilizzato sia supportato dal driver.";
+    t[519] = "L''autenticazione di tipo {0} non è supportata. Verificare che nel file di configurazione pg_hba.conf sia presente l''indirizzo IP o la sottorete del client, e che lo schema di autenticazione utilizzato sia supportato dal driver.";
     t[526] = "Interval {0} not yet implemented";
-    t[527] = "L''intervallo \u00ab{0}\u00bb non \u00e8 stato ancora implementato.";
+    t[527] = "L''intervallo «{0}» non è stato ancora implementato.";
     t[532] = "Conversion of interval failed";
-    t[533] = "Fallita la conversione di un \u00abinterval\u00bb.";
+    t[533] = "Fallita la conversione di un «interval».";
     t[540] = "Query timeout must be a value greater than or equals to 0.";
     t[541] = "Il timeout relativo alle query deve essere maggiore o eguale a 0.";
     t[542] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[543] = "La \u00abConnection\u00bb \u00e8 stata chiusa automaticamente perch\u00e9 una nuova l''ha sostituita nello stesso \u00abPooledConnection\u00bb, oppure il \u00abPooledConnection\u00bb \u00e8 stato chiuso.";
+    t[543] = "La «Connection» è stata chiusa automaticamente perché una nuova l''ha sostituita nello stesso «PooledConnection», oppure il «PooledConnection» è stato chiuso.";
     t[544] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[545] = "Il \u00abResultSet\u00bb non \u00e8 correttamente posizionato; forse \u00e8 necessario invocare \u00abnext()\u00bb.";
+    t[545] = "Il «ResultSet» non è correttamente posizionato; forse è necessario invocare «next()».";
     t[550] = "This statement has been closed.";
-    t[551] = "Questo statement \u00e8 stato chiuso.";
+    t[551] = "Questo statement è stato chiuso.";
     t[552] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[553] = "Non \u00e8 possibile identificare il tipo SQL da usare per l''istanza di tipo \u00ab{0}\u00bb. Usare \u00absetObject()\u00bb specificando esplicitamente il tipo da usare per questo valore.";
+    t[553] = "Non è possibile identificare il tipo SQL da usare per l''istanza di tipo «{0}». Usare «setObject()» specificando esplicitamente il tipo da usare per questo valore.";
     t[554] = "Cannot call updateRow() when on the insert row.";
-    t[555] = "Non \u00e8 possibile invocare \u00abupdateRow()\u00bb durante l''inserimento di una riga.";
+    t[555] = "Non è possibile invocare «updateRow()» durante l''inserimento di una riga.";
     t[562] = "Detail: {0}";
     t[563] = "Dettaglio: {0}";
     t[566] = "Cannot call deleteRow() when on the insert row.";
-    t[567] = "Non \u00e8 possibile invocare \u00abdeleteRow()\u00bb durante l''inserimento di una riga.";
+    t[567] = "Non è possibile invocare «deleteRow()» durante l''inserimento di una riga.";
     t[568] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[569] = "La posizione attuale \u00e8 precedente all''inizio del ResultSet. Non \u00e8 possibile invocare \u00abdeleteRow()\u00bb qui.";
+    t[569] = "La posizione attuale è precedente all''inizio del ResultSet. Non è possibile invocare «deleteRow()» qui.";
     t[576] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[577] = "Sequenza UTF-8 illegale: il valore \u00e8 finale \u00e8 un surrogato: {0}";
+    t[577] = "Sequenza UTF-8 illegale: il valore è finale è un surrogato: {0}";
     t[578] = "Unknown Response Type {0}.";
     t[579] = "Risposta di tipo sconosciuto {0}.";
     t[582] = "Unsupported value for stringtype parameter: {0}";
-    t[583] = "Il valore per il parametro di tipo string \u00ab{0}\u00bb non \u00e8 supportato.";
+    t[583] = "Il valore per il parametro di tipo string «{0}» non è supportato.";
     t[584] = "Conversion to type {0} failed: {1}.";
     t[585] = "Conversione al tipo {0} fallita: {1}.";
     t[586] = "Conversion of money failed.";
-    t[587] = "Fallita la conversione di un \u00abmoney\u00bb.";
+    t[587] = "Fallita la conversione di un «money».";
     t[600] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[601] = "Non \u00e8 possibile caricare la class \u00ab{0}\u00bb per gestire il tipo \u00ab{1}\u00bb.";
+    t[601] = "Non è possibile caricare la class «{0}» per gestire il tipo «{1}».";
     t[604] = "The fastpath function {0} is unknown.";
-    t[605] = "La funzione fastpath \u00ab{0}\u00bb \u00e8 sconosciuta.";
+    t[605] = "La funzione fastpath «{0}» è sconosciuta.";
     t[608] = "Malformed function or procedure escape syntax at offset {0}.";
     t[609] = "Sequenza di escape definita erroneamente nella funzione o procedura all''offset {0}.";
     t[612] = "Provided Reader failed.";
-    t[613] = "Il \u00abReader\u00bb fornito \u00e8 fallito.";
+    t[613] = "Il «Reader» fornito è fallito.";
     t[614] = "Maximum number of rows must be a value grater than or equal to 0.";
     t[615] = "Il numero massimo di righe deve essere maggiore o eguale a 0.";
     t[616] = "Failed to create object for: {0}.";
     t[617] = "Fallita la creazione dell''oggetto per: {0}.";
     t[622] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[623] = "Il flusso di input \u00e8 stato interrotto, sono arrivati {1} byte al posto dei {0} attesi.";
+    t[623] = "Il flusso di input è stato interrotto, sono arrivati {1} byte al posto dei {0} attesi.";
     t[626] = "An unexpected result was returned by a query.";
-    t[627] = "Un risultato inaspettato \u00e8 stato ricevuto dalla query.";
+    t[627] = "Un risultato inaspettato è stato ricevuto dalla query.";
     t[646] = "An error occurred while setting up the SSL connection.";
-    t[647] = "Si \u00e8 verificato un errore impostando la connessione SSL.";
+    t[647] = "Si è verificato un errore impostando la connessione SSL.";
     t[654] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
     t[655] = "Sequenza UTF-8 illegale: {0} byte utilizzati per codificare un valore di {1} byte: {2}";
     t[658] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[659] = "La classe \u00abSSLSocketFactory\u00bb specificata, \u00ab{0}\u00bb, non pu\u00f2 essere istanziata.";
+    t[659] = "La classe «SSLSocketFactory» specificata, «{0}», non può essere istanziata.";
     t[670] = "Position: {0}";
     t[671] = "Posizione: {0}";
     t[676] = "Location: File: {0}, Routine: {1}, Line: {2}";
     t[677] = "Individuazione: file: \"{0}\", routine: {1}, linea: {2}";
     t[684] = "Cannot tell if path is open or closed: {0}.";
-    t[685] = "Impossibile stabilire se il percorso \u00e8 aperto o chiuso: {0}.";
+    t[685] = "Impossibile stabilire se il percorso è aperto o chiuso: {0}.";
     t[700] = "Cannot convert an instance of {0} to type {1}";
-    t[701] = "Non \u00e8 possibile convertire una istanza di \u00ab{0}\u00bb nel tipo \u00ab{1}\u00bb";
+    t[701] = "Non è possibile convertire una istanza di «{0}» nel tipo «{1}»";
     t[710] = "{0} function takes four and only four argument.";
-    t[711] = "Il metodo \u00ab{0}\u00bb accetta quattro e solo quattro argomenti.";
+    t[711] = "Il metodo «{0}» accetta quattro e solo quattro argomenti.";
     t[718] = "Interrupted while attempting to connect.";
-    t[719] = "Si \u00e8 verificata una interruzione durante il tentativo di connessione.";
+    t[719] = "Si è verificata una interruzione durante il tentativo di connessione.";
     t[722] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[723] = "Sequenza UTF-8 illegale: il valore finale \u00e8 fuori dall''intervallo permesso: {0}";
+    t[723] = "Sequenza UTF-8 illegale: il valore finale è fuori dall''intervallo permesso: {0}";
     t[728] = "Failed to initialize LargeObject API";
     t[729] = "Inizializzazione di LargeObject API fallita.";
     t[736] = "{0} function takes one and only one argument.";
-    t[737] = "Il metodo \u00ab{0}\u00bb accetta un ed un solo argomento.";
+    t[737] = "Il metodo «{0}» accetta un ed un solo argomento.";
     t[744] = "This ResultSet is closed.";
-    t[745] = "Questo \u00abResultSet\u00bb \u00e8 chiuso.";
+    t[745] = "Questo «ResultSet» è chiuso.";
     t[746] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[747] = "Sono stati trovati caratteri non validi tra i dati. Molto probabilmente sono stati memorizzati dei caratteri che non sono validi per la codifica dei caratteri impostata alla creazione del database. Il caso pi\u00f9 diffuso \u00e8 quello nel quale si memorizzano caratteri a 8bit in un database con codifica SQL_ASCII.";
+    t[747] = "Sono stati trovati caratteri non validi tra i dati. Molto probabilmente sono stati memorizzati dei caratteri che non sono validi per la codifica dei caratteri impostata alla creazione del database. Il caso più diffuso è quello nel quale si memorizzano caratteri a 8bit in un database con codifica SQL_ASCII.";
     t[750] = "An I/O error occurred while sending to the backend.";
-    t[751] = "Si \u00e8 verificato un errore di I/O nella spedizione di dati al server.";
+    t[751] = "Si è verificato un errore di I/O nella spedizione di dati al server.";
     t[754] = "Ran out of memory retrieving query results.";
     t[755] = "Fine memoria scaricando i risultati della query.";
     t[756] = "Returning autogenerated keys is not supported.";
-    t[757] = "La restituzione di chiavi autogenerate non \u00e8 supportata.";
+    t[757] = "La restituzione di chiavi autogenerate non è supportata.";
     t[760] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[761] = "L''operazione richiete un \u00abResultSet\u00bb scorribile mentre questo \u00e8 \u00abFORWARD_ONLY\u00bb.";
+    t[761] = "L''operazione richiete un «ResultSet» scorribile mentre questo è «FORWARD_ONLY».";
     t[762] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[763] = "\u00c8 stato eseguito un \u00abCallableStatement\u00bb ma il parametro in uscita \u00ab{0}\u00bb era di tipo \u00ab{1}\u00bb al posto di \u00ab{2}\u00bb, che era stato dichiarato.";
+    t[763] = "È stato eseguito un «CallableStatement» ma il parametro in uscita «{0}» era di tipo «{1}» al posto di «{2}», che era stato dichiarato.";
     t[768] = "Unknown ResultSet holdability setting: {0}.";
-    t[769] = "Il parametro \u00abholdability\u00bb per il \u00abResultSet\u00bb \u00e8 sconosciuto: {0}.";
+    t[769] = "Il parametro «holdability» per il «ResultSet» è sconosciuto: {0}.";
     t[772] = "Transaction isolation level {0} not supported.";
-    t[773] = "Il livello di isolamento delle transazioni \u00ab{0}\u00bb non \u00e8 supportato.";
+    t[773] = "Il livello di isolamento delle transazioni «{0}» non è supportato.";
     t[776] = "No results were returned by the query.";
-    t[777] = "Nessun risultato \u00e8 stato restituito dalla query.";
+    t[777] = "Nessun risultato è stato restituito dalla query.";
     t[778] = "A CallableStatement was executed with nothing returned.";
-    t[779] = "Un \u00abCallableStatement\u00bb \u00e8 stato eseguito senza produrre alcun risultato. ";
+    t[779] = "Un «CallableStatement» è stato eseguito senza produrre alcun risultato. ";
     t[780] = "The maximum field size must be a value greater than or equal to 0.";
     t[781] = "La dimensione massima del campo deve essere maggiore o eguale a 0.";
     t[786] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[787] = "Questo statement non dichiara il parametro in uscita. Usare \u00ab{ ?= call ... }\u00bb per farlo.";
+    t[787] = "Questo statement non dichiara il parametro in uscita. Usare «{ ?= call ... }» per farlo.";
     t[788] = "Can''t use relative move methods while on the insert row.";
-    t[789] = "Non \u00e8 possibile utilizzare gli spostamenti relativi durante l''inserimento di una riga.";
+    t[789] = "Non è possibile utilizzare gli spostamenti relativi durante l''inserimento di una riga.";
     t[792] = "Connection is busy with another transaction";
-    t[793] = "La connessione \u00e8 utilizzata da un''altra transazione";
+    t[793] = "La connessione è utilizzata da un''altra transazione";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_ja.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_ja.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_ja.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_ja.java	2018-08-27 15:38:30.000000000 +0000
@@ -3,466 +3,588 @@
 public class messages_ja extends java.util.ResourceBundle {
   private static final java.lang.String[] table;
   static {
-    java.lang.String[] t = new java.lang.String[1178];
+    java.lang.String[] t = new java.lang.String[1426];
     t[0] = "";
-    t[1] = "Project-Id-Version: head-ja\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2010-04-11 22:58+0900\nLast-Translator: Hiroshi Saito <z-saito@guitar.ocn.ne.jp>\nLanguage-Team: PostgreSQL <z-saito@guitar.ocn.ne.jp>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.0.2\nX-Poedit-Language: Japanese\nX-Poedit-Country: Japan\n";
-    t[6] = "PostgreSQL LOBs can only index to: {0}";
-    t[7] = "PostgreSQL LOB \u306f\u3001\u30a4\u30f3\u30c7\u30c3\u30af\u30b9 {0} \u307e\u3067\u306e\u307f\u53ef\u80fd\u3067\u3059\u3002 ";
-    t[14] = "The server does not support SSL.";
-    t[15] = "\u30b5\u30fc\u30d0\u306fSSL\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u307e\u305b\u3093\u3002";
-    t[22] = "Error disabling autocommit";
-    t[23] = "\u81ea\u52d5\u30b3\u30df\u30c3\u30c8\u306e\u7121\u52b9\u5316\u30a8\u30e9\u30fc";
-    t[24] = "Hint: {0}";
-    t[25] = "\u30d2\u30f3\u30c8: {0}";
-    t[28] = "Interrupted while attempting to connect.";
-    t[29] = "\u63a5\u7d9a\u8a66\u884c\u4e2d\u306b\u5272\u308a\u8fbc\u307f\u304c\u3042\u308a\u307e\u3057\u305f\u3002";
-    t[32] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[33] = "PreparedStatement\u3067\u30af\u30a8\u30ea\u6587\u5b57\u3092\u6301\u3063\u305f\u30af\u30a8\u30ea\u30e1\u30bd\u30c3\u30c9\u306f\u4f7f\u3048\u307e\u305b\u3093\u3002";
-    t[34] = "Got CopyInResponse from server during an active {0}";
-    t[35] = "\u6d3b\u52d5\u4e2d\u306e\u30b5\u30fc\u30d0 {0} \u304b\u3089CopyInResponse\u3092\u5f97\u307e\u3057\u305f";
-    t[38] = "Cannot rollback when autoCommit is enabled.";
-    t[39] = "autoCommit\u6709\u52b9\u6642\u306b\u3001\u660e\u793a\u7684\u306a\u30ed\u30fc\u30eb\u30d0\u30c3\u30af\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[46] = "DataSource has been closed.";
-    t[47] = "\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306f\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002";
-    t[54] = "The fastpath function {0} is unknown.";
-    t[55] = "{0} \u306f\u672a\u77e5\u306e fastpath \u95a2\u6570\u3067\u3059\u3002";
-    t[56] = "The driver currently does not support COPY operations.";
-    t[57] = "\u73fe\u5728\u3001\u30c9\u30e9\u30a4\u30d0\u306f\u30b3\u30d4\u30fc\u64cd\u4f5c\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u305b\u3093\u3002";
-    t[60] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[61] = "UTF-8\u30b7\u30fc\u30b1\u30f3\u30b9\u9055\u53cd: \u6700\u7d42\u5024\u304c\u7bc4\u56f2\u5916\u3067\u3059: {0}";
-    t[64] = "Prepare called before end. prepare xid={0}, state={1}";
-    t[65] = "\u7d42\u4e86\u524d\u306b\"Prepare\"\u304c\u547c\u3070\u308c\u307e\u3057\u305f prepare xid={0}, state={1}";
-    t[66] = "Internal Query: {0}";
-    t[67] = "\u30a4\u30f3\u30bf\u30fc\u30ca\u30eb\u30fb\u30af\u30a8\u30ea: {0}";
-    t[68] = "An unexpected result was returned by a query.";
-    t[69] = "\u30af\u30a8\u30ea\u306b\u3088\u3063\u3066\u60f3\u5b9a\u3057\u306a\u3044\u7d50\u679c\u304c\u8fd4\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[82] = "Transaction isolation level {0} not supported.";
-    t[83] = "\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u9694\u96e2\u30ec\u30d9\u30eb{0} \u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002";
-    t[88] = "Requested CopyIn but got {0}";
-    t[89] = "CopyIn\u3092\u8981\u6c42\u3057\u307e\u3057\u305f\u304c {0} \u3092\u5f97\u307e\u3057\u305f\u3002";
-    t[90] = "Tried to write to an inactive copy operation";
-    t[91] = "\u52d5\u4f5c\u3057\u3066\u3044\u306a\u3044\u30b3\u30d4\u30fc\u64cd\u4f5c\u3067\u66f8\u304d\u8fbc\u307f\u3092\u8a66\u307f\u307e\u3057\u305f\u3002";
-    t[94] = "{0} function takes four and only four argument.";
-    t[95] = "{0} \u95a2\u6570\u306f\u3001\u56db\u3064\u306e\u5f15\u6570\u306e\u307f\u3092\u7528\u3044\u307e\u3059\u3002";
-    t[98] = "Unable to decode xml data.";
-    t[99] = "xml\u30c7\u30fc\u30bf\u3092\u5fa9\u53f7\u5316\u3067\u304d\u307e\u305b\u3093\u3002";
+    t[1] = "Project-Id-Version: head-ja\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2018-07-23 11:10+0900\nLast-Translator: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>\nLanguage-Team: PostgreSQL <z-saito@guitar.ocn.ne.jp>\nLanguage: ja_JP\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Poedit 1.5.4\n";
+    t[2] = "Method {0} is not yet implemented.";
+    t[3] = "{0} メソッドはまだ実装されていません。";
+    t[10] = "Got {0} error responses to single copy cancel request";
+    t[11] = "一つのコピー中断要求にたいして {0} 個のエラー応答が返されました";
+    t[26] = "Tried to obtain lock while already holding it";
+    t[27] = "すでに取得中のロックを取得しようとしました";
+    t[28] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
+    t[29] = "不正なプロトコル状態が要求されました。Transaction interleaving を試みましたが実装されていません。xid={0}, currentXid={1}, state={2}, flags={3}";
+    t[34] = "Unsupported property name: {0}";
+    t[35] = "サポートされていないプロパティ名: {0}";
+    t[36] = "Unsupported Types value: {0}";
+    t[37] = "サポートされない Types の値: {0}.";
+    t[44] = "The hostname {0} could not be verified by hostnameverifier {1}.";
+    t[45] = "ホスト名 {0} は、hostnameverifier {1} で検証できませんでした。";
+    t[52] = "Invalid UUID data.";
+    t[53] = "不正なUUIDデータです。";
+    t[54] = "{0} parameter value must be an integer but was: {1}";
+    t[55] = "パラメータ {0} の値は整数でなければなりませんが指定された値は {1} でした";
+    t[56] = "Copying from database failed: {0}";
+    t[57] = "データベースからのコピーに失敗しました: {0}";
+    t[58] = "Requested CopyDual but got {0}";
+    t[59] = "CopyDualを要求しましたが {0} が返却されました。";
+    t[64] = "Multiple ResultSets were returned by the query.";
+    t[65] = "クエリの実行により、複数のResultSetが返されました。";
+    t[76] = "Too many update results were returned.";
+    t[77] = "返却された更新結果が多すぎます。";
+    t[84] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
+    t[85] = "システムカタログにデータがないため MaxIndexKeys の値を決定できません。";
+    t[90] = "Database connection failed when starting copy";
+    t[91] = "コピー開始時のデータベース接続に失敗しました";
+    t[94] = "Unknown XML Result class: {0}";
+    t[95] = "未知のXML結果クラス: {0}";
     t[100] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
-    t[101] = "\u30b5\u30fc\u30d0\u306estandard_conforming_strings\u30d1\u30e9\u30e1\u30fc\u30bf\u306f\u3001{0}\u3068\u3057\u3066\u5831\u544a\u3055\u308c\u307e\u3057\u305f\u3002JDBC\u30c9\u30e9\u30a4\u30d0\u306f\u3001on \u307e\u305f\u306f off \u3092\u60f3\u5b9a\u3057\u307e\u3059\u3002";
-    t[102] = "There are no rows in this ResultSet.";
-    t[103] = "\u3053\u306eResultSet\u306b\u3044\u304b\u306a\u308b\u884c\u3082\u3042\u308a\u307e\u305b\u3093\u3002";
-    t[106] = "Server SQLState: {0}";
-    t[107] = "\u30b5\u30fc\u30d0 SQLState: {0}";
-    t[108] = "This copy stream is closed.";
-    t[109] = "\u30b3\u30d4\u30fc\u30fb\u30b9\u30c8\u30ea\u30fc\u30e0\u306f\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002";
-    t[120] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[121] = "\u30b5\u30fc\u30d0\u306eDateStyle\u30d1\u30e9\u30e1\u30fc\u30bf\u306f\u3001{0} \u306b\u5909\u308f\u308a\u307e\u3057\u305f\u3002JDBC\u30c9\u30e9\u30a4\u30d0\u306f\u3001\u6b63\u3057\u3044\u64cd\u4f5c\u306e\u305f\u3081ISO\u3067\u958b\u59cb\u3059\u308bDateStyle\u3092\u8981\u6c42\u3057\u307e\u3059\u3002";
-    t[122] = "Database connection failed when reading from copy";
-    t[123] = "\u30b3\u30d4\u30fc\u304b\u3089\u306e\u8aad\u307f\u53d6\u308a\u6642\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[124] = "Provided InputStream failed.";
-    t[125] = "\u63d0\u4f9b\u3055\u308c\u305f InputStream \u306f\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[142] = "Could not read SSL root certificate file {0}.";
-    t[143] = "SSL\u30eb\u30fc\u30c8\u8a3c\u660e\u66f8\u30d5\u30a1\u30a4\u30eb {0} \u3092\u8aad\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[144] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[145] = "ResultSet\u306f\u5909\u66f4\u53ef\u80fd\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3053\u306e\u7d50\u679c\u30bb\u30c3\u30c8\u3092\u751f\u6210\u3057\u305f\u30af\u30a8\u30ea\u306f\u3001\u305f\u3060\u4e00\u3064\u306e\u30c6\u30fc\u30d6\u30eb\u3092\u9078\u3073\u3001\u305d\u306e\u30c6\u30fc\u30d6\u30eb\u304b\u3089\u5168\u3066\u306e\u4e3b\u30ad\u30fc\u3092\u9078\u3070\u306a\u304f\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u3002\u3088\u308a\u591a\u304f\u306e\u8a73\u7d30\u306b\u95a2\u3057\u3066 JDBC 2.1 API\u4ed5\u69d8\u3001\u7ae0 5.6 \u3092\u53c2\u7167\u3057\u3066\u4e0b\u3055\u3044\u3002";
-    t[152] = "The array index is out of range: {0}";
-    t[153] = "\u914d\u5217\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f\u3001\u7bc4\u56f2\u5916\u3067\u3059: {0}";
-    t[154] = "Unexpected command status: {0}.";
-    t[155] = "\u60f3\u5b9a\u5916\u306e\u30b3\u30de\u30f3\u30c9\u30b9\u30c6\u30fc\u30bf\u30b9: {0}";
-    t[156] = "Unknown XML Result class: {0}";
-    t[157] = "\u672a\u77e5\u306eXML\u7d50\u679c\u30af\u30e9\u30b9: {0}";
-    t[160] = "Unexpected copydata from server for {0}";
-    t[161] = "{0} \u306e\u30b5\u30fc\u30d0\u304b\u3089\u306e\u601d\u3044\u304c\u3051\u306a\u3044 copydata \u3067\u3059\u3002";
-    t[162] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[163] = "\u65e9\u3059\u304e\u305f\u5165\u529b\u30b9\u30c8\u30ea\u30fc\u30e0\u306e\u7d42\u4e86\u3067\u3059\u3002{0} \u30d0\u30a4\u30c8\u304c\u60f3\u5b9a\u3055\u308c\u307e\u3057\u305f\u304c\u3001 {1} \u306e\u307f\u304c\u8aad\u307f\u8fbc\u307e\u308c\u307e\u3057\u305f\u3002";
-    t[168] = "Database connection failed when canceling copy operation";
-    t[169] = "\u30b3\u30d4\u30fc\u64cd\u4f5c\u53d6\u308a\u6d88\u3057\u6642\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[174] = "No primary key found for table {0}.";
-    t[175] = "\u30c6\u30fc\u30d6\u30eb {0} \u306e\u4e3b\u30ad\u30fc\u304c\u3042\u308a\u307e\u305b\u3093\u3002";
-    t[180] = "Enter SSL password: ";
-    t[181] = "SSL\u30d1\u30b9\u30ef\u30fc\u30c9\u5165\u529b: ";
-    t[182] = "{0} function takes one and only one argument.";
-    t[183] = "{0} \u95a2\u6570\u306f\u3001\u5358\u4e00\u306e\u5f15\u6570\u306e\u307f\u3092\u7528\u3044\u307e\u3059\u3002";
-    t[184] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[185] = "UTF-8\u30b7\u30fc\u30b1\u30f3\u30b9\u9055\u53cd: \u521d\u671f\u30d0\u30a4\u30c8\u306f\u3001{0}: {1}";
-    t[194] = "Could not find a java cryptographic algorithm: X.509 CertificateFactory not available.";
-    t[195] = "java\u306e\u6697\u53f7\u5316\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002X.509 CertificateFactory \u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[204] = "No value specified for parameter {0}.";
-    t[205] = "\u30d1\u30e9\u30e1\u30fc\u30bf {0} \u306b\u5024\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u307e\u305b\u3093\u3002";
-    t[210] = "The hostname {0} could not be verified.";
-    t[211] = "\u30db\u30b9\u30c8\u540d {0} \u306f\u78ba\u8a8d\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[216] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[217] = "\u958b\u59cb\u524d\u3082\u3057\u304f\u306f\u7d42\u4e86\u5f8c\u3067\u3042\u308b\u305f\u3081\u3001ResultSet\u3092\u66f4\u65b0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[218] = "SSL error: {0}";
-    t[219] = "SSL \u30a8\u30e9\u30fc: {0}";
-    t[220] = "{0} function doesn''t take any argument.";
-    t[221] = "{0} \u95a2\u6570\u306f\u3001\u3069\u306e\u3088\u3046\u306a\u5f15\u6570\u3082\u7528\u3044\u307e\u305b\u3093\u3002";
-    t[222] = "Connection is busy with another transaction";
-    t[223] = "\u63a5\u7d9a\u306f\u3001\u5225\u306e\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u306b\u5bfe\u5fdc\u4e2d\u3067\u3059\u3002";
-    t[228] = "Transaction control methods setAutoCommit(true), commit, rollback and setSavePoint not allowed while an XA transaction is active.";
-    t[229] = "\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u5236\u5fa1\u30e1\u30bd\u30c3\u30c9\u3067\u3042\u308b setAutoCommit(true), commit, rollback, setSavePoint \u306f\u3001XA\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u304c\u6709\u52b9\u3067\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[234] = "Could not open SSL root certificate file {0}.";
-    t[235] = "SSL\u30eb\u30fc\u30c8\u8a3c\u660e\u66f8\u30d5\u30a1\u30a4\u30eb {0} \u3092\u958b\u3051\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[236] = "Received CommandComplete ''{0}'' without an active copy operation";
-    t[237] = "\u6d3b\u52d5\u4e2d\u306e\u30b3\u30d4\u30fc\u64cd\u4f5c\u306a\u3057\u3067CommandComplete ''{0}'' \u3092\u53d7\u3051\u53d6\u308a\u307e\u3057\u305f\u3002";
-    t[242] = "free() was called on this LOB previously";
-    t[243] = "\u4ee5\u524d\u306b\u3001\u3053\u306eLOB\u306b\u5bfe\u3059\u308bfree() \u306f\u547c\u3070\u308c\u307e\u3057\u305f\u3002";
-    t[244] = "The hostname {0} could not be verified by hostnameverifier {1}.";
-    t[245] = "\u30db\u30b9\u30c8\u540d {0} \u306f\u3001hostnameverifier {1} \u3067\u78ba\u8a8d\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[246] = "Heuristic commit/rollback not supported. forget xid={0}";
-    t[247] = "\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u306a\u3044 commit/rollback \u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002forget xid={0}";
-    t[252] = "Got CopyOutResponse from server during an active {0}";
-    t[253] = "\u6d3b\u52d5\u4e2d\u306e\u30b5\u30fc\u30d0 {0} \u304b\u3089CopyOutResponse\u3092\u5f97\u307e\u3057\u305f";
-    t[258] = "Got {0} error responses to single copy cancel request";
-    t[259] = "\u5358\u4e00copy\u53d6\u308a\u6d88\u3057\u8981\u6c42\u306b {0} \u30a8\u30e9\u30fc\u5fdc\u7b54\u3092\u5f97\u307e\u3057\u305f\u3002";
-    t[260] = "Read from copy failed.";
-    t[261] = "copy\u304b\u3089\u306e\u8aad\u307f\u53d6\u308a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[264] = "Query timeout must be a value greater than or equals to 0.";
-    t[265] = "\u30af\u30a8\u30ea\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306f\u30010\u306b\u7b49\u3057\u3044\u304b\u3001\u3088\u308a\u5927\u304d\u306a\u5024\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002";
-    t[272] = "A result was returned when none was expected.";
-    t[273] = "\u7d50\u679c\u304c\u306a\u3044\u3053\u3068\u3092\u60f3\u5b9a\u3057\u307e\u3057\u305f\u304c\u3001\u7d50\u679c\u304c\u8fd4\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[276] = "Database connection failed when starting copy";
-    t[277] = "\u30b3\u30d4\u30fc\u958b\u59cb\u6642\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[282] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
-    t[283] = "Transaction interleaving \u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002xid={0}, currentXid={1}, state={2}, flags={3}";
-    t[286] = "Invalid stream length {0}.";
-    t[287] = "\u7121\u52b9\u306a\u30b9\u30c8\u30ea\u30fc\u30e0\u9577 {0}.";
-    t[300] = "Finalizing a Connection that was never closed:";
-    t[301] = "\u63a5\u7d9a\u7d42\u4e86\u3067\u9589\u3058\u3089\u308c\u307e\u305b\u3093\u3067\u3057\u305f:";
-    t[304] = "Cannot convert an instance of {0} to type {1}";
-    t[305] = "\u578b {1} \u306b {0} \u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u5909\u63db\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[306] = "A CallableStatement was executed with an invalid number of parameters";
-    t[307] = "CallableStatement\u306f\u3001\u4e0d\u6b63\u306a\u6570\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u3067\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[308] = "Could not read SSL key file {0}.";
-    t[309] = "SSL key\u30d5\u30a1\u30a4\u30eb {0} \u3092\u8aad\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[310] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
-    t[311] = "UTF-8\u30b7\u30fc\u30b1\u30f3\u30b9\u9055\u53cd: {0} \u30d0\u30a4\u30c8\u3092\u3001 {1} \u30d0\u30a4\u30c8\u5024\u306e\u30a8\u30f3\u30b3\u30fc\u30c9\u306b\u4f7f\u3044\u307e\u3057\u305f: {2}";
-    t[316] = "Unknown ResultSet holdability setting: {0}.";
-    t[317] = "\u672a\u77e5\u306e ResultSet \u306b\u5bfe\u3059\u308bholdability\u8a2d\u5b9a\u3067\u3059: {0}";
-    t[320] = "Unexpected error writing large object to database.";
-    t[321] = "\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3078\u306e\u30e9\u30fc\u30b8\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u60f3\u5b9a\u5916\u306e\u30a8\u30e9\u30fc\u304c\u8d77\u304d\u307e\u3057\u305f\u3002";
-    t[324] = "Cannot write to copy a byte of value {0}";
-    t[325] = "\u5024{0}\u306e\u30d0\u30a4\u30c8\u30b3\u30d4\u30fc\u3067\u66f8\u304d\u8fbc\u307f\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[326] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[327] = "UTF-8\u30b7\u30fc\u30b1\u30f3\u30b9\u9055\u53cd: \u6700\u7d42\u5024\u304c\u30b5\u30ed\u30b2\u30fc\u30c8\u5024\u3067\u3059: {0}";
-    t[332] = "Ran out of memory retrieving query results.";
-    t[333] = "\u30af\u30a8\u30ea\u306e\u7d50\u679c\u53d6\u5f97\u306b\u30e1\u30e2\u30ea\u3092\u4f7f\u3044\u679c\u305f\u3057\u307e\u3057\u305f\u3002";
-    t[334] = "The server requested password-based authentication, but no password was provided.";
-    t[335] = "\u30b5\u30fc\u30d0\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u30fb\u30d9\u30fc\u30b9\u306e\u8a8d\u8a3c\u3092\u8981\u6c42\u3057\u307e\u3057\u305f\u304c\u3001\u3044\u304b\u306a\u308b\u30d1\u30b9\u30ef\u30fc\u30c9\u3082\u63d0\u4f9b\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[336] = "Large Objects may not be used in auto-commit mode.";
-    t[337] = "\u30e9\u30fc\u30b8\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u3001\u81ea\u52d5\u30b3\u30df\u30c3\u30c8\u30e2\u30fc\u30c9\u3067\u4f7f\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[338] = "This ResultSet is closed.";
-    t[339] = "ResultSet\u306f\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002";
-    t[340] = "Returning autogenerated keys by column index is not supported.";
-    t[341] = "\u5217\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3067\u81ea\u52d5\u751f\u6210\u30ad\u30fc\u3092\u8fd4\u3059\u3053\u3068\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002";
-    t[348] = "Error during recover";
-    t[349] = "\u56de\u5fa9\u4e2d\u306b\u30a8\u30e9\u30fc";
-    t[350] = "Cannot truncate LOB to a negative length.";
-    t[351] = "\u8ca0\u306e\u5024\u3067LOB\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[358] = "The column name {0} was not found in this ResultSet.";
-    t[359] = "ResultSet \u306b\u5217\u540d {0} \u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[372] = "No function outputs were registered.";
-    t[373] = "\u95a2\u6570\u51fa\u529b\u306f\u767b\u9332\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[374] = "Unknown XML Source class: {0}";
-    t[375] = "\u672a\u77e5\u306eXML\u30bd\u30fc\u30b9\u30af\u30e9\u30b9: {0}";
-    t[386] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[387] = "CallableStatement\u306f\u5ba3\u8a00\u3055\u308c\u307e\u3057\u305f\u304c\u3001registerOutParameter(1, <some type>) \u306f\u547c\u3073\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[388] = "Connection has been closed.";
-    t[389] = "\u63a5\u7d9a\u306f\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002";
-    t[390] = "The JVM claims not to support the encoding: {0}";
-    t[391] = "JVM\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u306a\u3044\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3067\u3059: {0}";
-    t[392] = "This SQLXML object has already been initialized, so you cannot manipulate it further.";
-    t[393] = "\u3053\u306eSQLXML\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u65e2\u306b\u521d\u671f\u5316\u3055\u308c\u305f\u305f\u3081\u3001\u3053\u308c\u4ee5\u4e0a\u64cd\u4f5c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[404] = "Database connection failed when ending copy";
-    t[405] = "\u30b3\u30d4\u30fc\u7d42\u4e86\u6642\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[414] = "Not implemented: Prepare must be issued using the same connection that started the transaction. currentXid={0}, prepare xid={1}";
-    t[415] = "\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093: Prepare\u306f\u3001\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u3092\u958b\u59cb\u3057\u305f\u3068\u304d\u3068\u540c\u3058\u63a5\u7d9a\u3067\u4f7f\u308f\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002currentXid={0}, prepare xid={1}";
-    t[418] = "{0} function takes three and only three arguments.";
-    t[419] = "{0} \u95a2\u6570\u306f\u3001\u4e09\u3064\u306e\u5f15\u6570\u306e\u307f\u3092\u7528\u3044\u307e\u3059\u3002";
-    t[424] = "Invalid UUID data.";
-    t[425] = "\u7121\u52b9\u306aUUID\u30c7\u30fc\u30bf\u3067\u3059\u3002";
-    t[428] = "commit called before end. commit xid={0}, state={1}";
-    t[429] = "\u7d42\u4e86\u306e\u524d\u306b COMMIT \u3092\u547c\u3073\u307e\u3057\u305f commit xid={0}, state={1}";
-    t[430] = "Custom type maps are not supported.";
-    t[431] = "\u30ab\u30b9\u30bf\u30e0\u578b\u30de\u30c3\u30d7\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002";
-    t[436] = "Method {0} is not yet implemented.";
-    t[437] = "{0} \u30e1\u30bd\u30c3\u30c9\u306f\u307e\u3060\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002";
+    t[101] = "サーバのstandard_conforming_stringsパラメータは、{0}であると報告されました。JDBCドライバは、on または off を想定しています。";
+    t[102] = "Batch entry {0} {1} was aborted: {2}  Call getNextException to see other errors in the batch.";
+    t[103] = "バッチ {0} {1} はアボートしました: {2} このバッチの他のエラーは getNextException を呼び出すことで確認できます。";
+    t[104] = "Protocol error.  Session setup failed.";
+    t[105] = "プロトコルエラー。セッションは準備できませんでした。";
+    t[106] = "This SQLXML object has not been initialized, so you cannot retrieve data from it.";
+    t[107] = "このSQLXMLオブジェクトは初期化されてなかったため、そこからデータを取得できません。";
+    t[116] = "Bad value for type {0} : {1}";
+    t[117] = "型 {0} に対する不正な値 : {1}";
+    t[120] = "A CallableStatement was executed with an invalid number of parameters";
+    t[121] = "CallableStatement は不正な数のパラメータで実行されました。";
+    t[124] = "Error preparing transaction. prepare xid={0}";
+    t[125] = "トランザクションの準備エラー。prepare xid={0}";
+    t[126] = "Can''t use relative move methods while on the insert row.";
+    t[127] = "行挿入中に相対移動メソッドは使えません。";
+    t[130] = "Failed to create object for: {0}.";
+    t[131] = "{0} のオブジェクトの生成に失敗しました。";
+    t[138] = "Cannot change transaction read-only property in the middle of a transaction.";
+    t[139] = "トランザクションの中で read-only プロパティは変更できません。";
+    t[154] = "{0} function takes three and only three arguments.";
+    t[155] = "{0} 関数はちょうど3個の引数を取ります。";
+    t[158] = "One-phase commit called for xid {0} but connection was prepared with xid {1}";
+    t[159] = "単相コミットが xid {0} に対してよびだされましたが、コネクションは xid {1} と関連付けられています";
+    t[160] = "Validating connection.";
+    t[161] = "コネクションを検証しています";
+    t[166] = "This replication stream has been closed.";
+    t[167] = "このレプリケーション接続は既にクローズされています。";
+    t[168] = "An error occurred while trying to get the socket timeout.";
+    t[169] = "ソケットタイムアウト取得中にエラーが発生しました。";
+    t[170] = "Conversion of money failed.";
+    t[171] = "貨幣金額の変換に失敗しました。";
+    t[172] = "Provided Reader failed.";
+    t[173] = "渡された Reader で異常が発生しました。";
+    t[174] = "tried to call end without corresponding start call. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
+    t[175] = "対応する start の呼び出しなしで、end を呼び出しました。state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
+    t[178] = "Got CopyBothResponse from server during an active {0}";
+    t[179] = "{0} を実行中のサーバから CopyOutResponse を受け取りました";
+    t[186] = "Unknown ResultSet holdability setting: {0}.";
+    t[187] = "ResultSet の holdability に対する未知の設定値です: {0}";
+    t[190] = "Invalid server SCRAM signature";
+    t[191] = "不正なサーバSCRAM署名です";
+    t[192] = "The server''s client_encoding parameter was changed to {0}. The JDBC driver requires client_encoding to be UTF8 for correct operation.";
+    t[193] = "サーバの client_encoding パラメータが {0} に変わりました。JDBCドライバが正しく動作するためには、 client_encoding は UTF8 である必要があります。";
+    t[198] = "Detail: {0}";
+    t[199] = "詳細: {0}";
+    t[200] = "Unexpected packet type during copy: {0}";
+    t[201] = "コピー中の想定外のパケット型です: {0}";
+    t[206] = "Transaction isolation level {0} not supported.";
+    t[207] = "トランザクション分離レベル{0} はサポートされていません。";
+    t[210] = "The server requested password-based authentication, but no password was provided.";
+    t[211] = "サーバはパスワード・ベースの認証を要求しましたが、パスワードが渡されませんでした。";
+    t[214] = "Interrupted while attempting to connect.";
+    t[215] = "接続試行中に割り込みがありました。";
+    t[216] = "Fetch size must be a value greater to or equal to 0.";
+    t[217] = "フェッチサイズは、0または、より大きな値でなくてはなりません。";
+    t[228] = "Added parameters index out of range: {0}, number of columns: {1}.";
+    t[229] = "パラメータ・インデックスは範囲外です: {0} , カラム数: {1}";
+    t[230] = "Could not decrypt SSL key file {0}.";
+    t[231] = "SSL keyファイル {0} を復号できませんでした。";
+    t[242] = "Could not initialize SSL context.";
+    t[243] = "SSLコンテクストを初期化できませんでした。";
+    t[244] = "{0} function takes one and only one argument.";
+    t[245] = "{0} 関数はちょうど1個の引数を取ります。";
+    t[248] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
+    t[249] = "{0} 型のパラメータが登録されましたが、get{1} (sqltype={2}) が呼び出されました。";
+    t[258] = "Conversion of interval failed";
+    t[259] = "時間間隔の変換に失敗しました。";
+    t[262] = "xid must not be null";
+    t[263] = "xidはnullではいけません。";
+    t[264] = "Your security policy has prevented the connection from being attempted.  You probably need to grant the connect java.net.SocketPermission to the database server host and port that you wish to connect to.";
+    t[265] = "セキュリティ・ポリシーにより、接続が妨げられました。おそらく、接続先のデータベースサーバのホストとポートに対して java.net.SocketPermission の connect 権限を許可する必要があります。";
+    t[270] = "ClientInfo property not supported.";
+    t[271] = "ClientInfo プロパティはサポートされていません。";
+    t[272] = "LOB positioning offsets start at 1.";
+    t[273] = "LOB 位置指定のオフセット値は 1 以上です。";
+    t[276] = "Tried to write to an inactive copy operation";
+    t[277] = "実行中ではないコピー操作に書き込もうとしました";
+    t[278] = "suspend/resume not implemented";
+    t[279] = "停止/再開 は実装されていません。";
+    t[290] = "Transaction control methods setAutoCommit(true), commit, rollback and setSavePoint not allowed while an XA transaction is active.";
+    t[291] = "トランザクション制御メソッド setAutoCommit(true), commit, rollback, setSavePoint は、XAトランザクションが有効である間は利用できません。";
+    t[292] = "Unable to find server array type for provided name {0}.";
+    t[293] = "指定された名前 {0} のサーバ配列型はありません。";
+    t[300] = "Statement has been closed.";
+    t[301] = "ステートメントはクローズされました。";
+    t[302] = "The fastpath function {0} is unknown.";
+    t[303] = "{0} は未知の fastpath 関数です。";
+    t[306] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
+    t[307] = "サーバのDateStyleパラメータは、{0} に変わりました。JDBCドライバが正しく動作するためには、DateStyle が ISO で始まる値である必要があります。";
+    t[308] = "Invalid flags {0}";
+    t[309] = "不正なフラグ {0}";
+    t[324] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
+    t[325] = "CallableStatementは宣言されましたが、registerOutParameter(1, <some type>) は呼び出されませんでした。";
+    t[328] = "Cannot commit when autoCommit is enabled.";
+    t[329] = "autoCommit有効時に、明示的なコミットはできません。";
+    t[330] = "Database connection failed when writing to copy";
+    t[331] = "コピーへの書き込み中にデータベース接続で異常が発生しました";
+    t[334] = "Hint: {0}";
+    t[335] = "ヒント: {0}";
+    t[336] = "Interval {0} not yet implemented";
+    t[337] = "時間間隔 {0} は実装されていません";
+    t[338] = "No X509TrustManager found";
+    t[339] = "X509TrustManager が見つかりません";
+    t[346] = "No results were returned by the query.";
+    t[347] = "クエリは結果を返却しませんでした。";
+    t[354] = "Heuristic commit/rollback not supported. forget xid={0}";
+    t[355] = "ヒューリスティック commit/rollback はサポートされません。forget xid={0}";
+    t[362] = "Fastpath call {0} - No result was returned or wrong size while expecting an integer.";
+    t[363] = "Fastpath 呼び出し {0} - integer を想定していましたが、結果は返却されないかまたは間違った大きさでした。";
+    t[364] = "Cannot cast an instance of {0} to type {1}";
+    t[365] = "{0} のインスタンスは {1} 型へキャストできません";
+    t[366] = "ResultSet not positioned properly, perhaps you need to call next.";
+    t[367] = "適切な位置にいない ResultSetです。おそらく、nextを呼ぶ必要があります。";
+    t[372] = "Cannot establish a savepoint in auto-commit mode.";
+    t[373] = "自動コミットモードでsavepointを作成できません。";
+    t[374] = "Prepare called before end. prepare xid={0}, state={1}";
+    t[375] = "end より前に prepare が呼ばれました prepare xid={0}, state={1}";
+    t[382] = "You must specify at least one column value to insert a row.";
+    t[383] = "行挿入には、最低でも１つの列の値が必要です。";
+    t[388] = "Query timeout must be a value greater than or equals to 0.";
+    t[389] = "クエリタイムアウトは、0またはより大きな値でなくてはなりません。";
+    t[394] = "The array index is out of range: {0}, number of elements: {1}.";
+    t[395] = "配列インデックスが範囲外です: {0} 、要素の数: {1}";
+    t[396] = "The parameter index is out of range: {0}, number of parameters: {1}.";
+    t[397] = "パラメータのインデックスが範囲外です: {0} , パラメータ数: {1}";
+    t[400] = "This ResultSet is closed.";
+    t[401] = "この ResultSet はクローズされています。";
+    t[402] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
+    t[403] = "開始位置より前もしくは終了位置より後ろであるため、ResultSetを更新することができません。";
+    t[404] = "SSL error: {0}";
+    t[405] = "SSL エラー: {0}";
+    t[408] = "The column name {0} was not found in this ResultSet.";
+    t[409] = "この ResultSet に列名 {0} ありません。";
+    t[412] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
+    t[413] = "認証タイプ {0} はサポートされません。pg_hba.confでクライアントのIPアドレスまたはサブネットの指定があり、そのエントリでこのドライバがサポートする認証機構を使うように設定されていることを確認してください。";
+    t[440] = "The driver currently does not support COPY operations.";
+    t[441] = "ドライバはコピー操作をサポートしていません。";
     t[442] = "This statement has been closed.";
-    t[443] = "\u3053\u306e\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306f\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002";
-    t[448] = "xid must not be null";
-    t[449] = "xid\u306fnull\u3067\u306f\u3044\u3051\u307e\u305b\u3093\u3002";
+    t[443] = "このステートメントはクローズされています。";
+    t[444] = "Object is too large to send over the protocol.";
+    t[445] = "オブジェクトが大きすぎてこのプロトコルでは送信できません。";
+    t[448] = "oid type {0} not known and not a number";
+    t[449] = "OID型 {0} は未知でかつ数値でもありません";
+    t[452] = "No hstore extension installed.";
+    t[453] = "hstore 拡張がインストールされてません。";
     t[454] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[455] = "ResultSet\u306e\u7d42\u308f\u308a\u306e\u5f8c\u306b\u4f4d\u7f6e\u3057\u3066\u3044\u307e\u3057\u305f\u3002\u3053\u3053\u3067deleteRow()\u3092\u547c\u3076\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[456] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[457] = "Fastpath \u547c\u3073\u51fa\u3057 {0} - \u6574\u6570\u5024\u3092\u60f3\u5b9a\u3057\u307e\u3057\u305f\u304c\u3001\u3044\u304b\u306a\u308b\u7d50\u679c\u3082\u8fd4\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[464] = "wasNull cannot be call before fetching a result.";
-    t[465] = "wasNull\u306f\u3001\u7d50\u679c\u30d5\u30a7\u30c3\u30c1\u524d\u306b\u547c\u3073\u51fa\u305b\u307e\u305b\u3093\u3002";
-    t[470] = "Unsupported Types value: {0}";
-    t[471] = "\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u306a\u3044\u578b\u306e\u5024: {0}.";
-    t[478] = "Unable to find server array type for provided name {0}.";
-    t[479] = "\u63d0\u4f9b\u540d {0} \u3067\u3001\u30b5\u30fc\u30d0\u306e\u914d\u5217\u578b\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[490] = "Position: {0}";
-    t[491] = "\u30dd\u30b8\u30b7\u30e7\u30f3: {0}";
-    t[492] = "Conversion to type {0} failed: {1}.";
-    t[493] = "{0} \u3078\u306e\u578b\u5909\u63db\u306f\u5931\u6557\u3057\u307e\u3057\u305f: {1}.";
-    t[502] = "Failed to create object for: {0}.";
-    t[503] = "{0} \u3078\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[504] = "A CallableStatement was executed with nothing returned.";
-    t[505] = "CallableStatement\u306f\u3001\u623b\u308a\u306a\u3057\u3067\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[510] = "Could not read password for SSL key file, console is not available.";
-    t[511] = "SSL key\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u8aad\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30b3\u30f3\u30bd\u30fc\u30eb\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[514] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[515] = "\u884c\u633f\u5165\u6642\u306b cancelRowUpdates() \u3092\u547c\u3073\u51fa\u305b\u307e\u305b\u3093\u3002";
-    t[518] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[519] = "\u9593\u9055\u3063\u305f\u30b7\u30b9\u30c6\u30e0\u30fb\u30ab\u30bf\u30ed\u30b0\u30fb\u30c7\u30fc\u30bf\u306e\u305f\u3081\u306bMaxIndexKeys\u306e\u5024\u3092\u6c7a\u3081\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[520] = "Not on the insert row.";
-    t[521] = "\u633f\u5165\u884c\u304c\u3042\u308a\u307e\u305b\u3093\u3002";
-    t[524] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[525] = "\u5217\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f\u7bc4\u56f2\u5916\u3067\u3059: {0} , \u5217\u306e\u6570: {1}";
-    t[538] = "Unknown Response Type {0}.";
-    t[539] = "\u672a\u77e5\u306e\u5fdc\u7b54\u578b {0} \u3067\u3059\u3002";
+    t[455] = "ResultSet の最後尾より後ろにいるため、deleteRow() を呼ぶことはできません。";
+    t[462] = "The column index is out of range: {0}, number of columns: {1}.";
+    t[463] = "列インデックスは範囲外です: {0} , 列の数: {1}";
+    t[468] = "Got CopyInResponse from server during an active {0}";
+    t[469] = "{0} を実行中のサーバから CopyInResponse を受け取りました";
+    t[474] = "Fastpath call {0} - No result was returned and we expected a numeric.";
+    t[475] = "Fastpath 呼び出し {0} - numeric を想定していましたが、結果は返却されませんでした。";
+    t[482] = "An error occurred while setting up the SSL connection.";
+    t[483] = "SSL接続のセットアップ中に、エラーが起こりました。";
+    t[484] = "Could not open SSL certificate file {0}.";
+    t[485] = "SSL証明書ファイル {0} を開けませんでした。";
+    t[490] = "free() was called on this LOB previously";
+    t[491] = "このLOBに対して free() はすでに呼び出し済みです";
+    t[492] = "Finalizing a Connection that was never closed:";
+    t[493] = "クローズされていないコネクションの終了処理を行います: ";
+    t[494] = "Unsupported properties: {0}";
+    t[495] = "サポートされないプロパティ: {0}";
+    t[498] = "Interrupted while waiting to obtain lock on database connection";
+    t[499] = "データベース接続のロック待ちの最中に割り込みがありました";
+    t[504] = "The HostnameVerifier class provided {0} could not be instantiated.";
+    t[505] = "与えれた HostnameVerifier クラス {0} はインスタンス化できませんした。";
+    t[506] = "Unable to create SAXResult for SQLXML.";
+    t[507] = "SQLXMLに対するSAXResultを生成できません。";
+    t[508] = "The SSLSocketFactory class provided {0} could not be instantiated.";
+    t[509] = "渡された SSLSocketFactoryクラス {0} はインスタンス化できませんでした。";
+    t[510] = "The server does not support SSL.";
+    t[511] = "サーバはSSLをサポートしていません。";
+    t[516] = "Got CopyData without an active copy operation";
+    t[517] = "実行中のコピー操作がないにもかかわらず CopyData を受け取りました";
+    t[518] = "Error during one-phase commit. commit xid={0}";
+    t[519] = "単一フェーズのCOMMITの処理中のエラー commit xid={0}";
+    t[522] = "Network timeout must be a value greater than or equal to 0.";
+    t[523] = "ネットワークタイムアウトは、0またはより大きな値でなくてはなりません。";
+    t[532] = "Unsupported type conversion to {1}.";
+    t[533] = "{1} への型変換はサポートされていません。";
+    t[534] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
+    t[535] = "入力ストリームが途中で終了しました、{0} バイトを読み込もうとしましたが、 {1} バイトしかありませんでした。";
+    t[536] = "Zero bytes may not occur in string parameters.";
+    t[537] = "バイト値0を文字列ラメータに含めることはできません。";
+    t[538] = "This connection has been closed.";
+    t[539] = "このコネクションは既にクローズされています。";
     t[540] = "Cannot call deleteRow() when on the insert row.";
-    t[541] = "\u884c\u633f\u5165\u6642\u306b deleteRow() \u3092\u547c\u3073\u51fa\u305b\u307e\u305b\u3093\u3002";
-    t[544] = "Provided Reader failed.";
-    t[545] = "\u63d0\u4f9b\u3055\u308c\u305f Reader \u306f\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[552] = "Could not initialize SSL context.";
-    t[553] = "SSL context\u3092\u521d\u671f\u5316\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[554] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[555] = "\u30c7\u30fc\u30bf\u578b {1} \u306b\u5bfe\u5fdc\u3059\u308b\u30af\u30e9\u30b9{0} \u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002";
+    t[541] = "行挿入時に deleteRow() を呼び出せません。";
+    t[544] = "Unable to bind parameter values for statement.";
+    t[545] = "ステートメントのパラメータ値をバインドできませんでした。";
+    t[552] = "Cannot convert an instance of {0} to type {1}";
+    t[553] = "{0} のインスタンスは {1} 型に変換できません";
+    t[554] = "Conversion to type {0} failed: {1}.";
+    t[555] = "{0} への型変換に失敗しました: {1}";
+    t[556] = "Error loading default settings from driverconfig.properties";
+    t[557] = "driverconfig.properties からの初期設定ロード中のエラー";
     t[558] = "Expected command status BEGIN, got {0}.";
-    t[559] = "BEGIN\u30b3\u30de\u30f3\u30c9\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u60f3\u5b9a\u3057\u307e\u3057\u305f\u304c\u3001{0} \u3092\u5f97\u307e\u3057\u305f\u3002";
-    t[564] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[565] = "CallableStatement\u6a5f\u80fd\u304c\u5b9f\u884c\u3055\u308c\u3001\u51fa\u529b\u30d1\u30e9\u30e1\u30fc\u30bf {0} \u306f\u3001\u578b {1} \u3067\u3057\u305f\u3002\u3057\u304b\u3057\u3001\u578b {2} \u304c\u767b\u9332\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[572] = "No hstore extension installed.";
-    t[573] = "hstore \u62e1\u5f35\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u307e\u305b\u3093\u3002";
-    t[580] = "Error during one-phase commit. commit xid={0}";
-    t[581] = "\u5358\u4e00\u30d5\u30a7\u30fc\u30ba\u306eCOMMIT\u306e\u6700\u4e2d\u306b\u30a8\u30e9\u30fc commit xid={0}";
-    t[594] = "Unsupported value for stringtype parameter: {0}";
-    t[595] = "\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u306a\u3044stringtype\u30d1\u30e9\u30e1\u30fc\u30bf\u5024\u3067\u3059: {0}";
-    t[600] = "This connection has been closed.";
-    t[601] = "\u3053\u306e\u63a5\u7d9a\u306f\u65e2\u306b\u9589\u3058\u3089\u308c\u3066\u3044\u307e\u3059\u3002";
-    t[608] = "Could not open SSL certificate file {0}.";
-    t[609] = "SSL\u8a3c\u660e\u66f8\u30d5\u30a1\u30a4\u30eb {0} \u3092\u958b\u3051\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[612] = "CommandComplete expected COPY but got: ";
-    t[613] = "\u30b3\u30de\u30f3\u30c9\u5b8c\u4e86\u306fCOPY\u3092\u60f3\u5b9a\u3057\u307e\u3057\u305f\u304c\u3001\u6b21\u306e\u7d50\u679c\u3092\u5f97\u307e\u3057\u305f:";
-    t[616] = "Failed to convert binary xml data to encoding: {0}.";
-    t[617] = "\u30d0\u30a4\u30ca\u30eaxml\u30c7\u30fc\u30bf\u306e\u30a8\u30f3\u30b3\u30fc\u30c9: {0} \u3078\u306e\u5909\u63db\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[630] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[631] = "\u30c9\u30e9\u30a4\u30d0\u306e\u5931\u6557\u3092\u5f15\u304d\u8d77\u3053\u3059\u7570\u5e38\u304c\u8d77\u3053\u308a\u307e\u3057\u305f\u3002\u3053\u306e\u4f8b\u5916\u3092\u5831\u544a\u3057\u3066\u4e0b\u3055\u3044\u3002";
-    t[636] = "Your security policy has prevented the connection from being attempted.  You probably need to grant the connect java.net.SocketPermission to the database server host and port that you wish to connect to.";
-    t[637] = "\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fb\u30dd\u30ea\u30b7\u30fc\u306b\u3088\u308a\u3001\u63a5\u7d9a\u8a66\u884c\u306f\u59a8\u3052\u3089\u308c\u307e\u3057\u305f\u3002\u304a\u305d\u3089\u304f\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30b5\u30fc\u30d0\u30fb\u30db\u30b9\u30c8\u63a5\u7d9a\u306e\u305f\u3081java.net.SocketPermission\u3092\u8a31\u53ef\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002";
-    t[638] = "Statement has been closed.";
-    t[639] = "\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306f\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002";
-    t[640] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[641] = "\u540c\u3058PooledConnection\u304c\u958b\u304b\u308c\u305f\u306e\u3067\u65b0\u3057\u3044\u63a5\u7d9a\u306f\u81ea\u52d5\u7684\u306b\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002\u307e\u305f\u306f\u3001PooledConnection\u306f\u65e2\u306b\u9589\u3058\u3089\u308c\u3066\u3044\u307e\u3059\u3002";
-    t[642] = "Cannot cast an instance of {0} to type {1}";
-    t[643] = "\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9 {0} \u3092\u578b {1} \u3078\u30ad\u30e3\u30b9\u30c8\u3067\u304d\u307e\u305b\u3093";
-    t[646] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[647] = "\u64cd\u4f5c\u306f\u3001\u30b9\u30af\u30ed\u30fc\u30eb\u53ef\u80fd\u306aResultSet\u3092\u5fc5\u8981\u3068\u3057\u307e\u3059\u304c\u3001\u3053\u306eResultSet\u306f\u3001 FORWARD_ONLY\u3067\u3059\u3002";
-    t[662] = "Zero bytes may not occur in identifiers.";
-    t[663] = "\u30bc\u30ed\u30fb\u30d0\u30a4\u30c8\u3092\u8b58\u5225\u5b50\u306b\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[664] = "Unable to convert DOMResult SQLXML data to a string.";
-    t[665] = "DOMResult SQLXML\u30c7\u30fc\u30bf\u3092\u6587\u5b57\u5217\u306b\u5909\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[678] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[679] = "\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u306e\u6700\u4e2d\u306b\u9694\u96e2\u30ec\u30d9\u30eb\u3092\u5909\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[680] = "Error loading default settings from driverconfig.properties";
-    t[681] = "driverconfig.properties\u306b\u3088\u308b\u521d\u671f\u8a2d\u5b9a\u306e\u30ed\u30fc\u30c9\u30a8\u30e9\u30fc\u3002";
-    t[686] = "Unable to create SAXResult for SQLXML.";
-    t[687] = "SQLXML\u306b\u5bfe\u3059\u308bSAXResult\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[692] = "Unable to find name datatype in the system catalogs.";
-    t[693] = "\u540d\u524d\u30c7\u30fc\u30bf\u578b\u3092\u30b7\u30b9\u30c6\u30e0\u30ab\u30bf\u30ed\u30b0\u3067\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[696] = "oid type {0} not known and not a number";
-    t[697] = "\u6570\u5024\u3067\u306a\u3044\u3001\u672a\u77e5\u306eOID\u578b {0} \u3067\u3059\u3002";
-    t[700] = "Error committing prepared transaction. commit xid={0}, preparedXid={1}, currentXid={2}";
-    t[701] = "\u6e96\u5099\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u306e\u30b3\u30df\u30c3\u30c8\u30a8\u30e9\u30fc\u3002commit xid={0}, preparedXid={1}, currentXid={2}";
-    t[706] = "LOB positioning offsets start at 1.";
-    t[707] = "LOB \u30aa\u30d5\u30bb\u30c3\u30c8\u958b\u59cb\u4f4d\u7f6e\u3092 1 \u3068\u3057\u3066\u304f\u3060\u3055\u3044\u3002";
-    t[712] = "Invalid fetch direction constant: {0}.";
-    t[713] = "\u7121\u52b9\u306a\u30d5\u30a7\u30c3\u30c1\u65b9\u5411\u306e\u5b9a\u6570\u3067\u3059: {0}";
-    t[716] = "Returning autogenerated keys is not supported.";
-    t[717] = "\u81ea\u52d5\u751f\u6210\u30ad\u30fc\u3092\u8fd4\u3059\u3053\u3068\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002";
-    t[732] = "Cannot commit when autoCommit is enabled.";
-    t[733] = "autoCommit\u6709\u52b9\u6642\u306b\u3001\u660e\u793a\u7684\u306a\u30b3\u30df\u30c3\u30c8\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[734] = "Loading the SSL certificate {0} into a KeyManager failed.";
-    t[735] = "SSL\u8a3c\u660e\u66f8 {0} \u306eKeyManager\u3078\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[738] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[739] = "\u9069\u5207\u306a\u4f4d\u7f6e\u3092\u6307\u3057\u3066\u3044\u306a\u3044ResultSet\u3067\u3059\u3002\u304a\u305d\u3089\u304f\u3001next\u3092\u547c\u3076\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002";
-    t[746] = "Interrupted while waiting to obtain lock on database connection";
-    t[747] = "\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u3067\u30ed\u30c3\u30af\u5f85\u3061\u306e\u6700\u4e2d\u306b\u5272\u308a\u8fbc\u307f\u304c\u3042\u308a\u307e\u3057\u305f\u3002";
-    t[754] = "Failed to setup DataSource.";
-    t[755] = "\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[758] = "Too many update results were returned.";
-    t[759] = "\u591a\u3059\u304e\u308b\u66f4\u65b0\u7d50\u679c\u304c\u8fd4\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[762] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[763] = "CONCUR_READ_ONLY\u3092\u4f34\u3046ResultSets\u306f\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[770] = "Internal Position: {0}";
-    t[771] = "\u30a4\u30f3\u30bf\u30fc\u30ca\u30eb\u30fb\u30dd\u30b8\u30b7\u30e7\u30f3: {0}";
-    t[786] = "Unknown Types value.";
-    t[787] = "\u672a\u77e5\u306e\u578b\u306e\u5024\u3067\u3059\u3002";
-    t[788] = "This SQLXML object has not been initialized, so you cannot retrieve data from it.";
-    t[789] = "\u3053\u306eSQLXML\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u521d\u671f\u5316\u3055\u308c\u3066\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u305d\u3053\u304b\u3089\u30c7\u30fc\u30bf\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[790] = "Missing expected error response to copy cancel request";
-    t[791] = "\u30b3\u30d4\u30fc\u53d6\u308a\u6d88\u3057\u8981\u6c42\u306e\u30a8\u30e9\u30fc\u5fdc\u7b54\u3092\u60f3\u5b9a\u3057\u307e\u3057\u305f\u3002";
-    t[792] = "An error occurred while setting up the SSL connection.";
-    t[793] = "SSL\u63a5\u7d9a\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u4e2d\u306b\u3001\u30a8\u30e9\u30fc\u304c\u8d77\u3053\u308a\u307e\u3057\u305f\u3002";
-    t[794] = "Cannot retrieve the id of a named savepoint.";
-    t[795] = "\u540d\u524d\u306e\u4ed8\u3044\u305fsavepoint\u306eid\u3092\u53d6\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[796] = "Unable to translate data into the desired encoding.";
-    t[797] = "\u671b\u3080\u7b26\u53f7\u5316\u306b\u30c7\u30fc\u30bf\u3092\u8a33\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[802] = "Failed to initialize LargeObject API";
-    t[803] = "\u30e9\u30fc\u30b8\u30aa\u30d6\u30b8\u30a7\u30af\u30c8API\u306e\u521d\u671f\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[806] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[807] = "\u578b {0}  \u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u767b\u9332\u3055\u308c\u307e\u3057\u305f\u304c\u3001get{1} (sqltype={2}) \u304c\u547c\u3073\u51fa\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[814] = "Where: {0}";
-    t[815] = "\u5834\u6240: {0}";
-    t[826] = "Got CopyData without an active copy operation";
-    t[827] = "\u52d5\u4f5c\u4e2d\u306e\u30b3\u30d4\u30fc\u64cd\u4f5c\u306a\u3057\u3067CopyData\u3092\u5f97\u307e\u3057\u305f\u3002";
-    t[828] = "Unable to create StAXResult for SQLXML";
-    t[829] = "SQLXML\u306b\u5bfe\u3059\u308bStAXResult\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[832] = "Tried to cancel an inactive copy operation";
-    t[833] = "\u52d5\u4f5c\u3057\u3066\u3044\u306a\u3044\u30b3\u30d4\u30fc\u64cd\u4f5c\u306e\u53d6\u308a\u6d88\u3057\u3092\u8a66\u307f\u307e\u3057\u305f\u3002";
-    t[844] = "{0} function takes two or three arguments.";
-    t[845] = "{0} \u95a2\u6570\u306f\u3001\u4e8c\u3064\u3001\u307e\u305f\u306f\u4e09\u3064\u306e\u5f15\u6570\u3092\u7528\u3044\u307e\u3059\u3002";
-    t[846] = "Zero bytes may not occur in string parameters.";
-    t[847] = "\u30bc\u30ed\u30fb\u30d0\u30a4\u30c8\u3092\u6587\u5b57\u5217\u30d1\u30e9\u30e1\u30fc\u30bf\u4e2d\u306b\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[852] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[853] = "\u30d0\u30a4\u30f3\u30c9\u30e1\u30c3\u30bb\u30fc\u30b8\u9577 {0} \u306f\u9577\u3059\u304e\u307e\u3059\u3002InputStream\u30d1\u30e9\u30e1\u30fc\u30bf\u306b\u3068\u3066\u3082\u5927\u304d\u306a\u9577\u3055\u3001\u3042\u308b\u3044\u306f\u4e0d\u6b63\u78ba\u306a\u9577\u3055\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002";
-    t[854] = "tried to call end without corresponding start call. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
-    t[855] = "\u5bfe\u5fdc\u3059\u308b\u958b\u59cb\u547c\u3073\u51fa\u3057\u306a\u3057\u3067\u3001\u7d42\u4e86\u547c\u3073\u51fa\u3057\u307e\u3057\u305f\u3002state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
-    t[856] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[857] = "UTF-8\u30b7\u30fc\u30b1\u30f3\u30b9\u9055\u53cd: {1} \u30d0\u30a4\u30c8\u30b7\u30fc\u30b1\u30f3\u30b9\u306e {0} \u30d0\u30a4\u30c8 \u306f\u300110xxxxxx \u3067\u3042\u308a\u307e\u305b\u3093: {2}";
-    t[860] = "Not implemented: 2nd phase commit must be issued using an idle connection. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
-    t[861] = "\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093: \u7b2c\u4e8c\u30d5\u30a7\u30fc\u30ba\u306e COMMIT \u306f\u3001\u5f85\u6a5f\u63a5\u7d9a\u3067\u4f7f\u308f\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002xid={0}, currentXid={1}, state={2], transactionState={3}";
-    t[878] = "Can''t refresh the insert row.";
-    t[879] = "\u633f\u5165\u884c\u3092\u56de\u5fa9\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[880] = "This SQLXML object has already been freed.";
-    t[881] = "\u3053\u306eSQLXML\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u3059\u3067\u306b\u89e3\u653e\u3055\u308c\u3066\u3044\u307e\u3059\u3002";
-    t[882] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[883] = "\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u306e\u6700\u4e2d\u306b\u8aad\u307f\u51fa\u3057\u5c02\u7528\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u5909\u3048\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[886] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[887] = "\u30d1\u30e9\u30e1\u30fc\u30bf\u30fb\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f\u7bc4\u56f2\u5916\u3067\u3059: {0} , \u30d1\u30e9\u30e1\u30fc\u30bf\u6570: {1}";
-    t[896] = "Results cannot be retrieved from a CallableStatement before it is executed.";
-    t[897] = "\u5b9f\u884c\u3055\u308c\u308b\u524d\u306b\u3001CallableStatement \u304b\u3089\u7d50\u679c\u3092\u5f97\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[898] = "Fetch size must be a value greater to or equal to 0.";
-    t[899] = "\u30d5\u30a7\u30c3\u30c1\u30b5\u30a4\u30ba\u306f\u30010\u306b\u7b49\u3057\u3044\u304b\u3001\u3088\u308a\u5927\u304d\u306a\u5024\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002";
-    t[904] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[905] = "\u884c\u306e\u6700\u5927\u6570\u306f\u30010\u306b\u7b49\u3057\u3044\u304b\u3001\u3088\u308a\u5927\u304d\u306a\u5024\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002";
-    t[914] = "The connection attempt failed.";
-    t[915] = "\u63a5\u7d9a\u8a66\u884c\u306f\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[926] = "Error preparing transaction. prepare xid={0}";
-    t[927] = "\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u306e\u6e96\u5099\u30a8\u30e9\u30fc\u3002prepare xid={0}";
-    t[930] = "Tried to end inactive copy";
-    t[931] = "\u52d5\u4f5c\u3057\u3066\u3044\u306a\u3044\u30b3\u30d4\u30fc\u306e\u7d42\u4e86\u3092\u8a66\u307f\u307e\u3057\u305f\u3002";
-    t[942] = "Expected an EOF from server, got: {0}";
-    t[943] = "\u30b5\u30fc\u30d0\u304b\u3089\u306e EOF \u304c\u60f3\u5b9a\u3055\u308c\u307e\u3057\u305f\u304c\u3001{0} \u3092\u5f97\u307e\u3057\u305f\u3002";
-    t[944] = "This PooledConnection has already been closed.";
-    t[945] = "PooledConnection\u306f\u3001\u3059\u3067\u306b\u9589\u3058\u3089\u308c\u3066\u3044\u307e\u3059\u3002";
-    t[946] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[947] = "\u540d\u524d\u306e\u306a\u3044savepoint\u306e\u540d\u524d\u3092\u53d6\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[948] = "Tried to break lock on database connection";
-    t[949] = "\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306e\u30ed\u30c3\u30af\u4e2d\u65ad\u3092\u8a66\u307f\u307e\u3059\u3002";
-    t[950] = "Database connection failed when writing to copy";
-    t[951] = "\u30b3\u30d4\u30fc\u3078\u306e\u66f8\u304d\u8fbc\u307f\u6642\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[952] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[953] = "\u914d\u5217\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f\u3001\u7bc4\u56f2\u5916\u3067\u3059: {0} \u3001\u8981\u7d20\u306e\u6570: {1}";
-    t[954] = "Unknown type {0}.";
-    t[955] = "\u672a\u77e5\u306e\u578b {0}.";
-    t[956] = "Interval {0} not yet implemented";
-    t[957] = "\u9593\u9694 {0} \u306f\u307e\u3060\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002";
-    t[966] = "No results were returned by the query.";
-    t[967] = "\u3044\u304b\u306a\u308b\u7d50\u679c\u3082\u3001\u30af\u30a8\u30ea\u306b\u3088\u3063\u3066\u8fd4\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[970] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[971] = "\u63d0\u4f9b\u306eSSLSocketFactory\u30af\u30e9\u30b9 {0} \u306f\u3001\u5373\u5fdc\u3057\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002";
-    t[972] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[973] = "\u6b63\u3057\u304f\u306a\u3044\u95a2\u6570\u307e\u305f\u306f\u624b\u7d9a\u304d\u306f\u3001\u4f4d\u7f6e {0} \u3067\u6587\u6cd5\u3092\u9038\u3057\u307e\u3057\u305f\u3002";
-    t[978] = "Unable to bind parameter values for statement.";
-    t[979] = "\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u5024\u3092\u30d0\u30a4\u30f3\u30c9\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[986] = "{0} function takes two and only two arguments.";
-    t[987] = "{0} \u95a2\u6570\u306f\u3001\u4e8c\u3064\u306e\u5f15\u6570\u306e\u307f\u3092\u7528\u3044\u307e\u3059\u3002";
-    t[992] = "A connection could not be made using the requested protocol {0}.";
-    t[993] = "\u8981\u6c42\u3055\u308c\u305f\u30d7\u30ed\u30c8\u30b3\u30eb {0} \u3092\u4f7f\u7528\u3057\u3066\u63a5\u7d9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[994] = "Connection attempt timed out.";
-    t[995] = "\u63a5\u7d9a\u8a66\u884c\u304c\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u3057\u307e\u3057\u305f\u3002";
-    t[998] = "Protocol error.  Session setup failed.";
-    t[999] = "\u30d7\u30ed\u30c8\u30b3\u30eb\u30a8\u30e9\u30fc\u3002\u30bb\u30c3\u30b7\u30e7\u30f3\u8a2d\u5b9a\u306f\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[1002] = "Multiple ResultSets were returned by the query.";
-    t[1003] = "\u30af\u30a8\u30ea\u306e\u5b9f\u884c\u306b\u3088\u308a\u3001\u8907\u6570\u306eResultSet\u304c\u8fd4\u3055\u308c\u307e\u3057\u305f\u3002";
-    t[1004] = "Detail: {0}";
-    t[1005] = "\u8a73\u7d30: {0}";
-    t[1006] = "Object is too large to send over the protocol.";
-    t[1007] = "\u30d7\u30ed\u30c8\u30b3\u30eb\u3067\u9001\u4fe1\u3059\u308b\u306b\u306f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304c\u5927\u304d\u3059\u304e\u307e\u3059\u3002";
-    t[1008] = "Requested CopyOut but got {0}";
-    t[1009] = "CopyOut\u3092\u8981\u6c42\u3057\u307e\u3057\u305f\u304c {0} \u3092\u5f97\u307e\u3057\u305f\u3002";
-    t[1012] = "Could not find a java cryptographic algorithm: {0}.";
-    t[1013] = "java\u306e\u6697\u53f7\u5316\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0 {0} \u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[1018] = "Tried to obtain lock while already holding it";
-    t[1019] = "\u3059\u3067\u306b\u5360\u6709\u3057\u3066\u3044\u308b\u6700\u4e2d\u306e\u30ed\u30c3\u30af\u53d6\u5f97\u3067\u3059\u3002";
-    t[1020] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[1021] = "ResultSet\u306e\u958b\u59cb\u306e\u524d\u306b\u4f4d\u7f6e\u3057\u3066\u3044\u307e\u3057\u305f\u3002\u3053\u3053\u3067deleteRow()\u3092\u547c\u3076\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[1022] = "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, currentXid={2}";
-    t[1023] = "\u6e96\u5099\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u306e\u30ed\u30fc\u30eb\u30d0\u30c3\u30af\u30a8\u30e9\u30fc rollback xid={0}, preparedXid={1}, currentXid={2}";
-    t[1028] = "Validating connection.";
-    t[1029] = "\u6709\u52b9\u78ba\u8a8d\u306e\u63a5\u7d9a";
-    t[1034] = "You must specify at least one column value to insert a row.";
-    t[1035] = "\u884c\u633f\u5165\u306b\u306f\u3001\u6700\u4f4e\u3067\u3082\uff11\u3064\u306e\u5217\u306e\u5024\u304c\u5fc5\u8981\u3067\u3059\u3002";
-    t[1036] = "The JVM claims not to support the {0} encoding.";
-    t[1037] = "JVM\u306f\u3001\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 {0} \u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u305b\u3093\u3002";
-    t[1038] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
-    t[1039] = "\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093: \u5358\u4e00\u30d5\u30a7\u30fc\u30ba\u306eCOMMIT\u306f\u3001\u958b\u59cb\u6642\u3068\u540c\u3058\u63a5\u7d9a\u3067\u5b9f\u884c\u3055\u308c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002";
-    t[1040] = "Invalid flags {0}";
-    t[1041] = "\u7121\u52b9\u306a\u30d5\u30e9\u30b0\u3067\u3059\u3002{0}";
-    t[1046] = "Bad value for type {0} : {1}";
-    t[1047] = "\u578b {0} \u3067\u4e0d\u6b63\u306a\u5024 : {1}";
-    t[1054] = "Cannot establish a savepoint in auto-commit mode.";
-    t[1055] = "\u81ea\u52d5\u30b3\u30df\u30c3\u30c8\u30e2\u30fc\u30c9\u3067savepoint\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[1056] = "Could not decrypt SSL key file {0}.";
-    t[1057] = "SSL key\u30d5\u30a1\u30a4\u30eb {0} \u3092\u5fa9\u53f7\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[1064] = "Cannot call updateRow() when on the insert row.";
-    t[1065] = "\u884c\u3092\u633f\u5165\u3057\u305f\u3068\u304d\u306b\u3001updateRow() \u3092\u547c\u3073\u51fa\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[1068] = "Unexpected packet type during copy: {0}";
-    t[1069] = "\u30b3\u30d4\u30fc\u4e2d\u306e\u60f3\u5b9a\u5916\u306e\u30d1\u30b1\u30c3\u30c8\u578b\u3067\u3059: {0}";
-    t[1072] = "Conversion of interval failed";
-    t[1073] = "interval\u306e\u5909\u63db\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[1076] = "GSS Authentication failed";
-    t[1077] = "GSS\u8a8d\u8a3c\u306f\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[1084] = "Tried to read from inactive copy";
-    t[1085] = "\u52d5\u4f5c\u3057\u3066\u3044\u306a\u3044\u30b3\u30d4\u30fc\u304b\u3089\u8aad\u307f\u53d6\u308a\u3092\u8a66\u307f\u307e\u3057\u305f\u3002";
-    t[1088] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[1089] = "\u5834\u6240: \u30d5\u30a1\u30a4\u30eb: {0}, \u30eb\u30fc\u30c1\u30f3: {1},\u884c: {2}";
-    t[1098] = "suspend/resume not implemented";
-    t[1099] = "\u505c\u6b62/\u518d\u958b \u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002";
+    t[559] = "BEGINコマンドステータスを想定しましたが、{0} が返却されました。";
+    t[564] = "An unexpected result was returned by a query.";
+    t[565] = "クエリが想定外の結果を返却しました。";
+    t[568] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
+    t[569] = "何らかの異常によりドライバが動作できません。この例外を報告して下さい。";
+    t[576] = "One or more ClientInfo failed.";
+    t[577] = "1つ以上の ClinentInfo で問題が発生しました。";
+    t[578] = "Location: File: {0}, Routine: {1}, Line: {2}";
+    t[579] = "場所: ファイル: {0}, ルーチン: {1},行: {2}";
+    t[582] = "Unknown type {0}.";
+    t[583] = "未知の型 {0}.";
+    t[590] = "This SQLXML object has already been freed.";
+    t[591] = "このSQLXMLオブジェクトはすでに解放されています。";
+    t[594] = "Unexpected copydata from server for {0}";
+    t[595] = "{0} を実行中のサーバからのあり得ない CopyData";
+    t[596] = "{0} function takes two or three arguments.";
+    t[597] = "{0} 関数は2個、または3個の引数を取ります。";
+    t[602] = "Connection to {0} refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.";
+    t[603] = "{0} への接続が拒絶されました。ホスト名とポート番号が正しいことと、postmaster がTCP/IP接続を受け付けていることを確認してください。";
+    t[612] = "Unsupported binary encoding of {0}.";
+    t[613] = "{0} 型に対するサポートされないバイナリエンコーディング。";
+    t[616] = "Returning autogenerated keys is not supported.";
+    t[617] = "自動生成キーを返すことはサポートされていません。";
+    t[620] = "Provided InputStream failed.";
+    t[621] = "渡された InputStream で異常が発生しました。";
+    t[626] = "No IOException expected from StringBuffer or StringBuilder";
+    t[627] = "StringBuffer または StringBuilder からの IOException は想定されていません";
+    t[638] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
+    t[639] = "実装されていません: 単一フェーズのCOMMITは、開始時と同じ接続で発行されなければなりません。";
+    t[640] = "Cannot reference a savepoint after it has been released.";
+    t[641] = "解放された savepoint は参照できません。";
+    t[642] = "Ran out of memory retrieving query results.";
+    t[643] = "クエリの結果取得中にメモリ不足が起きました。";
+    t[654] = "No primary key found for table {0}.";
+    t[655] = "テーブル {0} には主キーがありません。";
+    t[658] = "Error during recover";
+    t[659] = "recover 処理中のエラー";
+    t[666] = "This copy stream is closed.";
+    t[667] = "このコピーストリームはクローズされています。";
+    t[668] = "Could not open SSL root certificate file {0}.";
+    t[669] = "SSLルート証明書ファイル {0} をオープンできませんでした。";
+    t[676] = "Invalid sslmode value: {0}";
+    t[677] = "不正な sslmode 値: {0}";
+    t[678] = "Cannot tell if path is open or closed: {0}.";
+    t[679] = "経路が開いているか、閉じているか判別できません: {0}";
+    t[682] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
+    t[683] = "不正なUTF-8シーケンス: {1} バイトの値のエンコードに{0} バイト使用しています: {2}";
+    t[684] = "Unknown XML Source class: {0}";
+    t[685] = "未知のXMLソースクラス: {0}";
+    t[686] = "Internal Query: {0}";
+    t[687] = "内部クエリ: {0}";
+    t[702] = "Could not find a java cryptographic algorithm: {0}.";
+    t[703] = "javaの暗号化アルゴリズム {0} を見つけることができませんでした。";
+    t[706] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
+    t[707] = "同じ PooledConnection に対して新しい接続をオープンしたか、この PooledConnection がクローズされたため、接続が自動的にクローズされました。";
+    t[708] = "Invalid fetch direction constant: {0}.";
+    t[709] = "不正なフェッチ方向の定数です: {0}";
+    t[714] = "Can''t use query methods that take a query string on a PreparedStatement.";
+    t[715] = "PreparedStatement でクエリ文字列を取るクエリメソッドは使えません。";
+    t[716] = "SCRAM authentication failed, server returned error: {0}";
+    t[717] = "スクラム認証が失敗しました、サーバはエラーを返却しました:  {0}";
+    t[722] = "Invalid elements {0}";
+    t[723] = "不正な要素です: {0}";
+    t[738] = "Not on the insert row.";
+    t[739] = "挿入行上にいません。";
+    t[740] = "Unable to load the class {0} responsible for the datatype {1}";
+    t[741] = "データ型 {1} に対応するクラス{0} をロードできません。";
+    t[752] = "Could not find a java cryptographic algorithm: X.509 CertificateFactory not available.";
+    t[753] = "javaの暗号化アルゴリズムを見つけることができませんでした。X.509 CertificateFactory は利用できません。";
+    t[756] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
+    t[757] = "{0} のインスタンスに対して使うべきSQL型を推測できません。明示的な Types 引数をとる setObject() で使うべき型を指定してください。";
+    t[760] = "Invalid server-first-message: {0}";
+    t[761] = "不正な server-first-message: {0}";
+    t[762] = "No value specified for parameter {0}.";
+    t[763] = "パラメータ {0} に値が設定されてません。";
+    t[764] = "Not implemented: 2nd phase commit must be issued using an idle connection. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
+    t[765] = "実装されていません: 第二フェーズの COMMIT は、待機接続で使わなくてはなりません。xid={0}, currentXid={1}, state={2], transactionState={3}";
+    t[766] = "Fastpath call {0} - No result was returned and we expected an integer.";
+    t[767] = "Fastpath 呼び出し {0} - integer を想定していましたが、結果は返却されませんでした。";
+    t[774] = "Unable to create StAXResult for SQLXML";
+    t[775] = "SQLXMLに対するStAXResultを生成できません。";
+    t[798] = "CommandComplete expected COPY but got: ";
+    t[799] = "CommandComplete はCOPYを想定しましたが、次の結果が返却されました:";
+    t[800] = "Enter SSL password: ";
+    t[801] = "SSLパスワード入力: ";
+    t[802] = "Failed to convert binary xml data to encoding: {0}.";
+    t[803] = "バイナリxmlデータのエンコード: {0} への変換に失敗しました。";
+    t[804] = "No SCRAM mechanism(s) advertised by the server";
+    t[805] = "サーバは SCRAM認証機構を広告していません";
+    t[818] = "Custom type maps are not supported.";
+    t[819] = "カスタム型マップはサポートされません。";
+    t[822] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
+    t[823] = "不正なUTF-8シーケンス: 変換後の値がサロゲート値です: {0}";
+    t[824] = "The SocketFactory class provided {0} could not be instantiated.";
+    t[825] = "渡された SocketFactoryクラス {0} はインスタンス化できませんでした。";
+    t[830] = "The hostname {0} could not be verified.";
+    t[831] = "ホスト名 {0} は検証できませんでした。";
+    t[832] = "Large Objects may not be used in auto-commit mode.";
+    t[833] = "ラージオブジェクトは、自動コミットモードで使うことができません。";
+    t[834] = "Fastpath call {0} - No result was returned or wrong size while expecting a long.";
+    t[835] = "Fastpath 呼び出し {0} - long を想定していましたが、結果は返却されないかまたは間違った大きさでした。";
+    t[844] = "Invalid stream length {0}.";
+    t[845] = "不正なストリーム長 {0}。";
+    t[850] = "The sslfactoryarg property must start with the prefix file:, classpath:, env:, sys:, or -----BEGIN CERTIFICATE-----.";
+    t[851] = "プロパティ sslfactoryarg の先頭はプリフィクス file:, classpath:, env:, sys: もしくは -----BEGIN CERTIFICATE----- のいずれかでなければなりません。";
+    t[852] = "Can''t use executeWithFlags(int) on a Statement.";
+    t[853] = "executeWithFlags(int) は Statement インスタンスでは使えません。";
+    t[856] = "Cannot retrieve the id of a named savepoint.";
+    t[857] = "名前付き savepoint の id は取得できません。";
+    t[860] = "Could not read password for SSL key file by callbackhandler {0}.";
+    t[861] = "callbackhandler {0} で、SSL keyファイルを読めませんでした。";
+    t[864] = "Failed to initialize LargeObject API";
+    t[865] = "ラージオブジェクトAPIの初期化に失敗しました。";
+    t[874] = "Tried to break lock on database connection";
+    t[875] = "データベース接続のロックを破壊しようとしました";
+    t[878] = "Unexpected error writing large object to database.";
+    t[879] = "データベースへのラージオブジェクト書き込み中に想定外のエラーが起きました。";
+    t[880] = "Expected an EOF from server, got: {0}";
+    t[881] = "サーバからの EOF を期待していましたが、{0} が送られてきました";
+    t[886] = "Could not read SSL root certificate file {0}.";
+    t[887] = "SSLルート証明書ファイル {0} を読めませんでした。";
+    t[888] = "This SQLXML object has already been initialized, so you cannot manipulate it further.";
+    t[889] = "このSQLXMLオブジェクトは既に初期化済みであるため、これ以上操作できません。";
+    t[896] = "The array index is out of range: {0}";
+    t[897] = "配列インデックスが範囲外です: {0}";
+    t[898] = "Unable to set network timeout.";
+    t[899] = "ネットワークタイムアウトが設定できません。";
+    t[900] = "{0} function takes four and only four argument.";
+    t[901] = "{0} 関数はちょうど4個の引数を取ります。";
+    t[904] = "Unable to decode xml data.";
+    t[905] = "xmlデータをデコードできません。";
+    t[916] = "Bad value for type timestamp/date/time: {1}";
+    t[917] = "timestamp/date/time 型に対する不正な値: {1}";
+    t[928] = "Illegal UTF-8 sequence: final value is out of range: {0}";
+    t[929] = "不正なUTF-8シーケンス: 変換後の値が範囲外です: {0}";
+    t[932] = "Unable to parse the count in command completion tag: {0}.";
+    t[933] = "コマンド完了タグのカウントをパースできません: {0}";
+    t[942] = "Read from copy failed.";
+    t[943] = "コピーストリームからの読み取りに失敗しました。";
+    t[944] = "Maximum number of rows must be a value grater than or equal to 0.";
+    t[945] = "行数の制限値は 0またはより大きな値でなくてはなりません。";
+    t[958] = "The password callback class provided {0} could not be instantiated.";
+    t[959] = "渡されたパスワードコールバッククラス {0} はインスタンス化できませんでした。";
+    t[960] = "Returning autogenerated keys by column index is not supported.";
+    t[961] = "列インデックスで自動生成キーを返すことはサポートされていません。";
+    t[966] = "Properties for the driver contains a non-string value for the key ";
+    t[967] = "このドライバのプロパティでは以下のキーに対して文字列ではない値が設定されています: ";
+    t[974] = "Database connection failed when canceling copy operation";
+    t[975] = "コピー操作中断のためのデータベース接続に失敗しました";
+    t[976] = "DataSource has been closed.";
+    t[977] = "データソースはクローズされました。";
+    t[996] = "Unable to get network timeout.";
+    t[997] = "ネットワークタイムアウトが取得できません。";
+    t[1000] = "A CallableStatement was executed with nothing returned.";
+    t[1001] = "CallableStatement が実行されましたがなにも返却されませんでした。";
+    t[1002] = "Can''t refresh the insert row.";
+    t[1003] = "挿入行を再フェッチすることはできません。";
+    t[1004] = "Could not find a server with specified targetServerType: {0}";
+    t[1005] = "指定された targetServerType のサーバーが見つかりません: {0}";
+    t[1006] = "This PooledConnection has already been closed.";
+    t[1007] = "この PooledConnectionは、すでに閉じられています。";
+    t[1010] = "Cannot call cancelRowUpdates() when on the insert row.";
+    t[1011] = "行挿入時に cancelRowUpdates() を呼び出せません。";
+    t[1012] = "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}";
+    t[1013] = "すでにプリペアされているトランザクションをプリペアしようとしました、プリペアされている xid={0}, プリペアしようとした xid={1}";
+    t[1018] = "CopyIn copy direction can't receive data";
+    t[1019] = "コピー方向 CopyIn はデータを受信できません";
+    t[1024] = "conversion to {0} from {1} not supported";
+    t[1025] = "{1} から {0} への変換はサポートされていません。";
+    t[1030] = "An error occurred reading the certificate";
+    t[1031] = "証明書の読み込み中にエラーが起きました";
+    t[1032] = "Invalid or unsupported by client SCRAM mechanisms";
+    t[1033] = "不正であるかクライアントのSCRAM機構でサポートされていません";
+    t[1034] = "Malformed function or procedure escape syntax at offset {0}.";
+    t[1035] = "関数またはプロシージャの間違ったエスケープ構文が位置{0}で見つかりました。";
+    t[1038] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
+    t[1039] = "バインドメッセージ長 {0} は長すぎます。InputStreamのパラメータにとても大きな長さ、あるいは不正確な長さが設定されている可能性があります。";
+    t[1050] = "Cannot change transaction isolation level in the middle of a transaction.";
+    t[1051] = "トランザクションの中でトランザクション分離レベルは変更できません。";
+    t[1058] = "Internal Position: {0}";
+    t[1059] = "内部位置: {0}";
+    t[1062] = "No function outputs were registered.";
+    t[1063] = "関数出力は登録されていません。";
+    t[1072] = "Unexpected packet type during replication: {0}";
+    t[1073] = "レプリケーション中に想定外のパケット型: {0}";
+    t[1076] = "Error disabling autocommit";
+    t[1077] = "自動コミットの無効化処理中のエラー";
+    t[1080] = "Requested CopyOut but got {0}";
+    t[1081] = "CopyOut を要求しましたが {0} が返却されました";
+    t[1084] = "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, currentXid={2}";
+    t[1085] = "プリペアドトランザクションのロールバック中のエラー rollback xid={0}, preparedXid={1}, currentXid={2}";
+    t[1086] = "Database connection failed when ending copy";
+    t[1087] = "コピー操作の終了中にデータベース接続で異常が発生しました";
+    t[1090] = "Unsupported value for stringtype parameter: {0}";
+    t[1091] = "サポートされないstringtypeパラメータ値です: {0}";
+    t[1094] = "The sslfactoryarg property may not be empty.";
+    t[1095] = "プロパティ sslfactoryarg は空であってはなりません。";
     t[1102] = "Loading the SSL root certificate {0} into a TrustManager failed.";
-    t[1103] = "SSL\u30eb\u30fc\u30c8\u8a3c\u660e\u66f8 {0} \u306eTrustManager\u3078\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[1108] = "Could not read password for SSL key file by callbackhandler {0}.";
-    t[1109] = "callbackhandler {0} \u3067\u3001SSL key\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002";
-    t[1110] = "Copying from database failed: {0}";
-    t[1111] = "\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304b\u3089\u30b3\u30d4\u30fc\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}";
-    t[1112] = "Cannot tell if path is open or closed: {0}.";
-    t[1113] = "path \u304c \u30aa\u30fc\u30d7\u30f3\u3057\u3066\u3044\u308b\u304b\u3001\u30af\u30ed\u30fc\u30ba\u3057\u3066\u3044\u308b\u304b\u5224\u5225\u3067\u304d\u307e\u305b\u3093: {0}";
-    t[1116] = "Conversion of money failed.";
-    t[1117] = "money\u306e\u5909\u63db\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002";
-    t[1118] = "Can''t use relative move methods while on the insert row.";
-    t[1119] = "\u884c\u633f\u5165\u306e\u6700\u4e2d\u306b\u95a2\u9023\u306e\u52d5\u4f5c\u65b9\u6cd5\u3092\u4f7f\u3046\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[1124] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[1125] = "\u4e0d\u6b63\u306a\u6587\u5b57\u30c7\u30fc\u30bf\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u3053\u308c\u306f\u3001\u6050\u3089\u304f\u4f5c\u6210\u3055\u308c\u305f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u6587\u5b57\u30bb\u30c3\u30c8\u306b\u3068\u3063\u3066\u7121\u52b9\u3067\u3042\u308b\u6587\u5b57\u3092\u542b\u3080\u30c7\u30fc\u30bf\u304c\u683c\u7d0d\u3055\u308c\u305f\u3053\u3068\u306b\u3088\u3063\u3066\u5f15\u304d\u8d77\u3053\u3055\u308c\u307e\u3059\u3002\u6700\u3082\u4e00\u822c\u7684\u306a\u4f8b\u306f\u3001SQL_ASCII\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u4fdd\u5b58\u3055\u308c\u305f8bit\u30c7\u30fc\u30bf\u7b49\u3067\u3059\u3002";
-    t[1126] = "The maximum field size must be a value greater than or equal to 0.";
-    t[1127] = "\u6700\u5927\u306e\u9805\u76ee\u30b5\u30a4\u30ba\u306f\u30010\u306b\u7b49\u3057\u3044\u304b\u3001\u3088\u308a\u5927\u304d\u306a\u5024\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002";
-    t[1128] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[1129] = "\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9 {0} \u3067\u4f7f\u3046\u3079\u304dSQL\u578b\u3092\u63a8\u6e2c\u3067\u304d\u307e\u305b\u3093\u3002\u660e\u78ba\u306a\u578b\u5024\u3092\u8a18\u8ff0\u3057\u305f setObject() \u3092\u4f7f\u3063\u3066\u304f\u3060\u3055\u3044\u3002";
-    t[1136] = "Cannot reference a savepoint after it has been released.";
-    t[1137] = "savepoint\u306f\u3001\u89e3\u653e\u3055\u308c\u305f\u5f8c\u3067\u53c2\u7167\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002";
-    t[1138] = "ClientInfo property not supported.";
-    t[1139] = "ClientInfo \u30d7\u30ed\u30d1\u30c6\u30a3\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002";
-    t[1152] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[1153] = "\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306f\u3001OUT\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u5ba3\u8a00\u3057\u3066\u3044\u307e\u305b\u3093\u3002'{' ?= call ... '}' \u3092\u4f7f\u3063\u3066\u5ba3\u8a00\u3057\u3066\u4e0b\u3055\u3044\u3002";
-    t[1156] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[1157] = "\u8a8d\u8a3c\u578b {0} \u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002pg_hba.conf\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210\u3067\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306eIP\u30a2\u30c9\u30ec\u30b9\u3001\u30b5\u30d6\u30cd\u30c3\u30c8\u304c\u542b\u307e\u308c\u3066\u3044\u308b\u304b\u3001\u305d\u3057\u3066\u30c9\u30e9\u30a4\u30d0\u304c\u30b5\u30dd\u30fc\u30c8\u3059\u308b\u8a8d\u8a3c\u6a5f\u69cb\u3092\u4f7f\u3063\u3066\u3044\u308b\u304b\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002";
-    t[1162] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[1163] = "\u30e9\u30fc\u30b8\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u9664\u53bb\u306f\u3001\u30b5\u30fc\u30d0\u30d0\u30fc\u30b8\u30e7\u30f3\u304c 8.3 \u4ee5\u4e0a\u3067\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u3059\u3002";
+    t[1103] = "SSLルート証明書 {0} をTrustManagerへ読み込めませんでした。";
+    t[1104] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
+    t[1105] = "不正なUTF-8シーケンス: 先頭バイトが {0}: {1}";
+    t[1116] = "The environment variable containing the server's SSL certificate must not be empty.";
+    t[1117] = "サーバのSSL証明書を指定する環境変数は空であってはなりません。";
+    t[1118] = "Connection attempt timed out.";
+    t[1119] = "接続試行がタイムアウトしました。";
+    t[1130] = "Cannot write to copy a byte of value {0}";
+    t[1131] = "バイト値{0}はコピーストリームへの書き込みはできません";
+    t[1132] = "Connection has been closed.";
+    t[1133] = "接続はクローズされました。";
+    t[1136] = "Could not read password for SSL key file, console is not available.";
+    t[1137] = "SSL keyファイルのパスワードを読めませんでした。コンソールは利用できません。";
+    t[1140] = "The JVM claims not to support the encoding: {0}";
+    t[1141] = "JVMでサポートされないエンコーディングです: {0}";
+    t[1146] = "Unexpected command status: {0}.";
+    t[1147] = "想定外のコマンドステータス: {0}。";
+    t[1154] = "Cannot rollback when autoCommit is enabled.";
+    t[1155] = "autoCommit有効時に、明示的なロールバックはできません。";
+    t[1158] = "Not implemented: Prepare must be issued using the same connection that started the transaction. currentXid={0}, prepare xid={1}";
+    t[1159] = "実装されていません: Prepareは、トランザクションを開始したものと同じコネクションで発行しなくてはなりません。currentXid={0}, prepare xid={1}";
+    t[1162] = "The connection attempt failed.";
+    t[1163] = "接続試行は失敗しました。";
+    t[1166] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
+    t[1167] = "不正なUTF-8シーケンス: {1} バイトのシーケンス中 {0} バイト目が、10xxxxxx ではありません: {2}";
+    t[1178] = "A connection could not be made using the requested protocol {0}.";
+    t[1179] = "要求されたプロトコル {0} で接続することができませんでした。";
+    t[1182] = "The system property containing the server's SSL certificate must not be empty.";
+    t[1183] = "サーバーのSSL証明書を指定するシステムプロパティは空であってはなりません。";
+    t[1188] = "Cannot call updateRow() when on the insert row.";
+    t[1189] = "挿入行上では updateRow() を呼び出すことができません。";
+    t[1192] = "Fastpath call {0} - No result was returned and we expected a long.";
+    t[1193] = "Fastpath 呼び出し {0} - long を想定していましたが、結果は返却されませんでした。";
+    t[1198] = "Truncation of large objects is only implemented in 8.3 and later servers.";
+    t[1199] = "ラージオブジェクトの切り詰めは、バージョン8.3 以降のサーバでのみ実装されています。";
+    t[1200] = "Cannot convert the column of type {0} to requested type {1}.";
+    t[1201] = "{0}型のカラムの値を指定の型 {1} に変換できませんでした。";
+    t[1204] = "Requested CopyIn but got {0}";
+    t[1205] = "CopyIn を要求しましたが {0} が返却されました";
+    t[1206] = "Cannot cast to boolean: \"{0}\"";
+    t[1207] = "boolean へのキャストはできません: \"{0}\"";
+    t[1212] = "Invalid server-final-message: {0}";
+    t[1213] = "不正な server-final-message: {0}.";
+    t[1214] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
+    t[1215] = "このステートメントは、OUTパラメータを宣言していません。'{' ?= call ... '}' を使って宣言して下さい。";
+    t[1218] = "Cannot truncate LOB to a negative length.";
+    t[1219] = "LOBを負の長さに切り詰めることはできません。";
+    t[1220] = "Zero bytes may not occur in identifiers.";
+    t[1221] = "バイト値0を識別子に含めることはできません。";
+    t[1222] = "Unable to convert DOMResult SQLXML data to a string.";
+    t[1223] = "DOMResult SQLXMLデータを文字列に変換することができません。";
+    t[1224] = "Missing expected error response to copy cancel request";
+    t[1225] = "予期していたコピーの中断要求へのエラー応答がありませんでした";
+    t[1234] = "SCRAM authentication is not supported by this driver. You need JDK >= 8 and pgjdbc >= 42.2.0 (not \".jre\" versions)";
+    t[1235] = "SCRAM認証はこのドライバではサポートされません。JDK8 以降かつ pgjdbc 42.2.0 以降(\".jre\"のバージョンではありません)が必要です。";
+    t[1240] = "Tried to end inactive copy";
+    t[1241] = "実行中ではないコピー操作を終了しようとしました";
+    t[1246] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
+    t[1247] = "CallableStatement 関数が実行され、出力パラメータ {0} は {1} 型 でした。しかし、{2} 型 が登録されました。";
+    t[1250] = "Failed to setup DataSource.";
+    t[1251] = "データソースのセットアップに失敗しました。";
+    t[1252] = "Loading the SSL certificate {0} into a KeyManager failed.";
+    t[1253] = "SSL証明書 {0} をKeyManagerへ読み込めませんでした。";
+    t[1254] = "Could not read SSL key file {0}.";
+    t[1255] = "SSL keyファイル {0} を読めませんでした。";
+    t[1258] = "Tried to read from inactive copy";
+    t[1259] = "実行中ではないコピーから読み取ろうとしました";
+    t[1260] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
+    t[1261] = "ResultSetは更新不可です。この結果セットを生成したクエリは、ただ一つのテーブルを選択して、そのテーブルの全ての主キーを選択する必要があります。詳細に関しては JDBC 2.1 API仕様、章 5.6 を参照して下さい。";
+    t[1264] = "A result was returned when none was expected.";
+    t[1265] = "ないはずの結果が返却されました。";
+    t[1266] = "Tried to cancel an inactive copy operation";
+    t[1267] = "実行中ではないコピー操作の中断を試みました";
+    t[1268] = "Server SQLState: {0}";
+    t[1269] = "サーバ SQLState: {0}";
+    t[1272] = "Unable to find keywords in the system catalogs.";
+    t[1273] = "キーワードはシステムカタログにありません。";
+    t[1276] = "Connection is busy with another transaction";
+    t[1277] = "接続は、別のトランザクションを処理中です";
+    t[1280] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
+    t[1281] = "CONCUR_READ_ONLYに設定されている ResultSet は更新できません。";
+    t[1296] = "commit called before end. commit xid={0}, state={1}";
+    t[1297] = "end の前に COMMIT を呼びました commit xid={0}, state={1}";
+    t[1308] = "PostgreSQL LOBs can only index to: {0}";
+    t[1309] = "PostgreSQL LOB 上の位置指定は最大 {0} までです";
+    t[1310] = "Where: {0}";
+    t[1311] = "場所: {0}";
+    t[1312] = "Unable to find name datatype in the system catalogs.";
+    t[1313] = "name データ型がシステムカタログにありません。";
+    t[1314] = "Invalid targetServerType value: {0}";
+    t[1315] = "不正な  targetServerType 値です。{0}.";
+    t[1318] = "Cannot retrieve the name of an unnamed savepoint.";
+    t[1319] = "無名 savepoint の名前は取得できません。";
+    t[1320] = "Error committing prepared transaction. commit xid={0}, preparedXid={1}, currentXid={2}";
+    t[1321] = "プリペアドトランザクションの COMMIT 処理中のエラー。commit xid={0}, preparedXid={1}, currentXid={2}";
+    t[1324] = "Invalid timeout ({0}<0).";
+    t[1325] = "不正なタイムアウト値 ({0}<0)。";
+    t[1328] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
+    t[1329] = "操作は、スクロール可能なResultSetを必要としますが、このResultSetは、 FORWARD_ONLYです。";
+    t[1330] = "Results cannot be retrieved from a CallableStatement before it is executed.";
+    t[1331] = "実行前の CallableStatement から結果の取得はできません。";
+    t[1332] = "wasNull cannot be call before fetching a result.";
+    t[1333] = "wasNullは、結果フェッチ前に呼び出せません。";
+    t[1336] = "{0} function doesn''t take any argument.";
+    t[1337] = "{0} 関数は引数を取りません。";
+    t[1344] = "Unknown Response Type {0}.";
+    t[1345] = "未知の応答タイプ {0} です。";
+    t[1346] = "The JVM claims not to support the {0} encoding.";
+    t[1347] = "JVMは、エンコーディング {0} をサポートしません。";
+    t[1348] = "{0} function takes two and only two arguments.";
+    t[1349] = "{0} 関数はちょうど2個の引数を取ります。";
+    t[1350] = "The maximum field size must be a value greater than or equal to 0.";
+    t[1351] = "最大の項目サイズは、0またはより大きな値でなくてはなりません。";
+    t[1352] = "Received CommandComplete ''{0}'' without an active copy operation";
+    t[1353] = "実行中のコピー操作がないにもかかわらず CommandComplete ''{0}'' を受信しました";
+    t[1354] = "Unable to translate data into the desired encoding.";
+    t[1355] = "データを指定されたエンコーディングに変換することができません。";
+    t[1368] = "Got CopyOutResponse from server during an active {0}";
+    t[1369] = "{0} を実行中のサーバから CopyOutResponse を受け取りました";
+    t[1370] = "Failed to set ClientInfo property: {0}";
+    t[1371] = "ClientInfo のプロパティの設定に失敗しました: {0}";
+    t[1372] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
+    t[1373] = "不正な文字データが見つかりました。これはデータベース作成時の文字セットに対して不正な文字を含むデータが格納されているために起きている可能性が高いです。最も一般的な例は、SQL_ASCIIデータベースに8bitデータが保存されている場合です。";
+    t[1374] = "Unknown Types value.";
+    t[1375] = "未知の Types の値です。";
+    t[1376] = " (pgjdbc: autodetected server-encoding to be {0}, if the message is not readable, please check database logs and/or host, port, dbname, user, password, pg_hba.conf)";
+    t[1377] = "(pgjdbc: server-encoding として {0}  を自動検出しました、メッセージが読めない場合はデータベースログおよび host, port, dbname, user, password, pg_dba.conf を確認してください)";
+    t[1386] = "GSS Authentication failed";
+    t[1387] = "GSS認証は失敗しました。";
+    t[1390] = "An error occurred while trying to reset the socket timeout.";
+    t[1391] = "ソケットタイムアウトのリセット中にエラーが発生しました。";
+    t[1392] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
+    t[1393] = "RsultSet の開始点より前にいるため、deleteRow() を呼ぶことはできません。";
+    t[1394] = "Current connection does not have an associated xid. prepare xid={0}";
+    t[1395] = "この接続は xid と関連付けられていません。プリペア xid={0}";
+    t[1408] = "An I/O error occurred while sending to the backend.";
+    t[1409] = "バックエンドへの送信中に、入出力エラーが起こりました。";
+    t[1416] = "One-phase commit with unknown xid. commit xid={0}, currentXid={1}";
+    t[1417] = "未知の xid の単相コミット。 コミットxid={0}, 現在のxid={1}";
+    t[1420] = "Position: {0}";
+    t[1421] = "位置: {0}";
+    t[1422] = "There are no rows in this ResultSet.";
+    t[1423] = "このResultSetに行がありません。";
+    t[1424] = "Database connection failed when reading from copy";
+    t[1425] = "コピーからの読み取り中にデータベース接続で異常が発生しました";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
     int hash_val = msgid.hashCode() & 0x7fffffff;
-    int idx = (hash_val % 589) << 1;
+    int idx = (hash_val % 713) << 1;
     {
       java.lang.Object found = table[idx];
       if (found == null)
@@ -470,11 +592,11 @@
       if (msgid.equals(found))
         return table[idx + 1];
     }
-    int incr = ((hash_val % 587) + 1) << 1;
+    int incr = ((hash_val % 711) + 1) << 1;
     for (;;) {
       idx += incr;
-      if (idx >= 1178)
-        idx -= 1178;
+      if (idx >= 1426)
+        idx -= 1426;
       java.lang.Object found = table[idx];
       if (found == null)
         return null;
@@ -486,13 +608,13 @@
     return
       new java.util.Enumeration() {
         private int idx = 0;
-        { while (idx < 1178 && table[idx] == null) idx += 2; }
+        { while (idx < 1426 && table[idx] == null) idx += 2; }
         public boolean hasMoreElements () {
-          return (idx < 1178);
+          return (idx < 1426);
         }
         public java.lang.Object nextElement () {
           java.lang.Object key = table[idx];
-          do idx += 2; while (idx < 1178 && table[idx] == null);
+          do idx += 2; while (idx < 1426 && table[idx] == null);
           return key;
         }
       };
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_nl.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_nl.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_nl.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_nl.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,7 +5,7 @@
   static {
     java.lang.String[] t = new java.lang.String[36];
     t[0] = "";
-    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.0\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2004-10-11 23:55-0700\nLast-Translator: Arnout Kuiper <ajkuiper@wxs.nl>\nLanguage-Team: Dutch <ajkuiper@wxs.nl>\nLanguage: nl\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
+    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.0\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2004-10-11 23:55-0700\nLast-Translator: Arnout Kuiper <ajkuiper@wxs.nl>\nLanguage-Team: Dutch <ajkuiper@wxs.nl>\nLanguage: nl\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
     t[2] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
     t[3] = "Iets ongewoons is opgetreden, wat deze driver doet falen. Rapporteer deze fout AUB: {0}";
     t[8] = "Unknown Types value.";
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_pl.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_pl.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_pl.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_pl.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,141 +5,141 @@
   static {
     java.lang.String[] t = new java.lang.String[346];
     t[0] = "";
-    t[1] = "Project-Id-Version: head-pl\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2005-05-22 03:01+0200\nLast-Translator: Jaros\u0142aw Jan Pyszny <jarek@pyszny.net>\nLanguage-Team:  <pl@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.10\nPlural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n";
+    t[1] = "Project-Id-Version: head-pl\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2005-05-22 03:01+0200\nLast-Translator: Jarosław Jan Pyszny <jarek@pyszny.net>\nLanguage-Team:  <pl@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.10\nPlural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n";
     t[2] = "The driver currently does not support COPY operations.";
-    t[3] = "Sterownik nie obs\u0142uguje aktualnie operacji COPY.";
+    t[3] = "Sterownik nie obsługuje aktualnie operacji COPY.";
     t[4] = "Internal Query: {0}";
-    t[5] = "Wewn\u0119trzne Zapytanie: {0}";
+    t[5] = "Wewnętrzne Zapytanie: {0}";
     t[6] = "There are no rows in this ResultSet.";
-    t[7] = "Nie ma \u017cadnych wierszy w tym ResultSet.";
+    t[7] = "Nie ma żadnych wierszy w tym ResultSet.";
     t[8] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[9] = "Znaleziono nieprawid\u0142owy znak. Najprawdopodobniej jest to spowodowane przechowywaniem w bazie znak\u00f3w, kt\u00f3re nie pasuj\u0105 do zestawu znak\u00f3w wybranego podczas tworzenia bazy danych. Najcz\u0119stszy przyk\u0142ad to przechowywanie 8-bitowych znak\u00f3w w bazie o kodowaniu SQL_ASCII.";
+    t[9] = "Znaleziono nieprawidłowy znak. Najprawdopodobniej jest to spowodowane przechowywaniem w bazie znaków, które nie pasują do zestawu znaków wybranego podczas tworzenia bazy danych. Najczęstszy przykład to przechowywanie 8-bitowych znaków w bazie o kodowaniu SQL_ASCII.";
     t[12] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[13] = "Wywo\u0142anie fastpath {0} - Nie otrzymano \u017cadnego wyniku, a oczekiwano liczby ca\u0142kowitej.";
+    t[13] = "Wywołanie fastpath {0} - Nie otrzymano żadnego wyniku, a oczekiwano liczby całkowitej.";
     t[14] = "An error occurred while setting up the SSL connection.";
-    t[15] = "Wyst\u0105pi\u0142 b\u0142\u0105d podczas ustanawiania po\u0142\u0105czenia SSL.";
+    t[15] = "Wystąpił błąd podczas ustanawiania połączenia SSL.";
     t[20] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[21] = "Funkcja CallableStatement zosta\u0142a zadeklarowana, ale nie wywo\u0142ano registerOutParameter (1, <jaki\u015b typ>).";
+    t[21] = "Funkcja CallableStatement została zadeklarowana, ale nie wywołano registerOutParameter (1, <jakiś typ>).";
     t[24] = "Unexpected command status: {0}.";
     t[25] = "Nieoczekiwany status komendy: {0}.";
     t[32] = "A connection could not be made using the requested protocol {0}.";
-    t[33] = "Nie mo\u017cna by\u0142o nawi\u0105za\u0107 po\u0142\u0105czenia stosuj\u0105c \u017c\u0105dany protoko\u0142u {0}.";
+    t[33] = "Nie można było nawiązać połączenia stosując żądany protokołu {0}.";
     t[38] = "Bad value for type {0} : {1}";
-    t[39] = "Z\u0142a warto\u015b\u0107 dla typu {0}: {1}";
+    t[39] = "Zła wartość dla typu {0}: {1}";
     t[40] = "Not on the insert row.";
     t[41] = "Nie na wstawianym rekordzie.";
     t[42] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[43] = "Przedwczesny koniec strumienia wej\u015bciowego, oczekiwano {0} bajt\u00f3w, odczytano tylko {1}.";
+    t[43] = "Przedwczesny koniec strumienia wejściowego, oczekiwano {0} bajtów, odczytano tylko {1}.";
     t[48] = "Unknown type {0}.";
     t[49] = "Nieznany typ {0}.";
     t[52] = "The server does not support SSL.";
-    t[53] = "Serwer nie obs\u0142uguje SSL.";
+    t[53] = "Serwer nie obsługuje SSL.";
     t[60] = "Cannot call updateRow() when on the insert row.";
-    t[61] = "Nie mo\u017cna wywo\u0142a\u0107 updateRow() na wstawianym rekordzie.";
+    t[61] = "Nie można wywołać updateRow() na wstawianym rekordzie.";
     t[62] = "Where: {0}";
     t[63] = "Gdzie: {0}";
     t[66] = "Failed to initialize LargeObject API";
-    t[67] = "Nie uda\u0142o si\u0119 zainicjowa\u0107 LargeObject API";
+    t[67] = "Nie udało się zainicjować LargeObject API";
     t[72] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[73] = "Nie mo\u017cna wywo\u0142a\u0107 cancelRowUpdates() na wstawianym rekordzie.";
+    t[73] = "Nie można wywołać cancelRowUpdates() na wstawianym rekordzie.";
     t[82] = "Server SQLState: {0}";
     t[83] = "Serwer SQLState: {0}";
     t[92] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[93] = "ResultSet nie jest modyfikowalny (not updateable). Zapytanie, kt\u00f3re zwr\u00f3ci\u0142o ten wynik musi dotyczy\u0107 tylko jednej tabeli oraz musi pobiera\u0107 wszystkie klucze g\u0142\u00f3wne tej tabeli. Zobacz Specyfikacj\u0119 JDBC 2.1 API, rozdzia\u0142 5.6, by uzyska\u0107 wi\u0119cej szczeg\u00f3\u0142\u00f3w.";
+    t[93] = "ResultSet nie jest modyfikowalny (not updateable). Zapytanie, które zwróciło ten wynik musi dotyczyć tylko jednej tabeli oraz musi pobierać wszystkie klucze główne tej tabeli. Zobacz Specyfikację JDBC 2.1 API, rozdział 5.6, by uzyskać więcej szczegółów.";
     t[102] = "Cannot tell if path is open or closed: {0}.";
-    t[103] = "Nie mo\u017cna stwierdzi\u0107, czy \u015bcie\u017cka jest otwarta czy zamkni\u0119ta: {0}.";
+    t[103] = "Nie można stwierdzić, czy ścieżka jest otwarta czy zamknięta: {0}.";
     t[108] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[109] = "Indeks parametru jest poza zakresem: {0}, liczba parametr\u00f3w: {1}.";
+    t[109] = "Indeks parametru jest poza zakresem: {0}, liczba parametrów: {1}.";
     t[110] = "Unsupported Types value: {0}";
-    t[111] = "Nieznana warto\u015b\u0107 Types: {0}";
+    t[111] = "Nieznana wartość Types: {0}";
     t[112] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[113] = "Aktualna pozycja za ko\u0144cem ResultSet. Nie mo\u017cna wywo\u0142a\u0107 deleteRow().";
+    t[113] = "Aktualna pozycja za końcem ResultSet. Nie można wywołać deleteRow().";
     t[114] = "This ResultSet is closed.";
-    t[115] = "Ten ResultSet jest zamkni\u0119ty.";
+    t[115] = "Ten ResultSet jest zamknięty.";
     t[120] = "Conversion of interval failed";
-    t[121] = "Konwersja typu interval nie powiod\u0142a si\u0119";
+    t[121] = "Konwersja typu interval nie powiodła się";
     t[122] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[123] = "Nie jest mo\u017cliwe za\u0142adowanie klasy {0} odpowiedzialnej za typ danych {1}";
+    t[123] = "Nie jest możliwe załadowanie klasy {0} odpowiedzialnej za typ danych {1}";
     t[138] = "Error loading default settings from driverconfig.properties";
-    t[139] = "B\u0142\u0105d podczas wczytywania ustawie\u0144 domy\u015blnych z driverconfig.properties";
+    t[139] = "Błąd podczas wczytywania ustawień domyślnych z driverconfig.properties";
     t[142] = "The array index is out of range: {0}";
     t[143] = "Indeks tablicy jest poza zakresem: {0}";
     t[146] = "Unknown Types value.";
-    t[147] = "Nieznana warto\u015b\u0107 Types.";
+    t[147] = "Nieznana wartość Types.";
     t[154] = "The maximum field size must be a value greater than or equal to 0.";
-    t[155] = "Maksymalny rozmiar pola musi by\u0107 warto\u015bci\u0105 dodatni\u0105 lub 0.";
+    t[155] = "Maksymalny rozmiar pola musi być wartością dodatnią lub 0.";
     t[168] = "Detail: {0}";
-    t[169] = "Szczeg\u00f3\u0142y: {0}";
+    t[169] = "Szczegóły: {0}";
     t[170] = "Unknown Response Type {0}.";
     t[171] = "Nieznany typ odpowiedzi {0}.";
     t[172] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[173] = "Maksymalna liczba rekord\u00f3w musi by\u0107 warto\u015bci\u0105 dodatni\u0105 lub 0.";
+    t[173] = "Maksymalna liczba rekordów musi być wartością dodatnią lub 0.";
     t[184] = "Query timeout must be a value greater than or equals to 0.";
-    t[185] = "Timeout zapytania musi by\u0107 warto\u015bci\u0105 dodatni\u0105 lub 0.";
+    t[185] = "Timeout zapytania musi być wartością dodatnią lub 0.";
     t[186] = "Too many update results were returned.";
-    t[187] = "Zapytanie nie zwr\u00f3ci\u0142o \u017cadnych wynik\u00f3w.";
+    t[187] = "Zapytanie nie zwróciło żadnych wyników.";
     t[190] = "The connection attempt failed.";
-    t[191] = "Pr\u00f3ba nawi\u0105zania po\u0142\u0105czenia nie powiod\u0142a si\u0119.";
+    t[191] = "Próba nawiązania połączenia nie powiodła się.";
     t[198] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[199] = "Po\u0142\u0105czenie zosta\u0142o zamkni\u0119te automatycznie, poniewa\u017c nowe po\u0142\u0105czenie zosta\u0142o otwarte dla tego samego PooledConnection lub PooledConnection zosta\u0142o zamkni\u0119te.";
+    t[199] = "Połączenie zostało zamknięte automatycznie, ponieważ nowe połączenie zostało otwarte dla tego samego PooledConnection lub PooledConnection zostało zamknięte.";
     t[204] = "Protocol error.  Session setup failed.";
-    t[205] = "B\u0142\u0105d protoko\u0142u. Nie uda\u0142o si\u0119 utworzy\u0107 sesji.";
+    t[205] = "Błąd protokołu. Nie udało się utworzyć sesji.";
     t[206] = "This PooledConnection has already been closed.";
-    t[207] = "To PooledConnection zosta\u0142o ju\u017c zamkni\u0119te.";
+    t[207] = "To PooledConnection zostało już zamknięte.";
     t[208] = "DataSource has been closed.";
-    t[209] = "DataSource zosta\u0142o zamkni\u0119te.";
+    t[209] = "DataSource zostało zamknięte.";
     t[212] = "Method {0} is not yet implemented.";
-    t[213] = "Metoda {0}nie jest jeszcze obs\u0142ugiwana.";
+    t[213] = "Metoda {0}nie jest jeszcze obsługiwana.";
     t[216] = "Hint: {0}";
-    t[217] = "Wskaz\u00f3wka: {0}";
+    t[217] = "Wskazówka: {0}";
     t[218] = "No value specified for parameter {0}.";
-    t[219] = "Nie podano warto\u015bci dla parametru {0}.";
+    t[219] = "Nie podano wartości dla parametru {0}.";
     t[222] = "Position: {0}";
     t[223] = "Pozycja: {0}";
     t[226] = "Cannot call deleteRow() when on the insert row.";
-    t[227] = "Nie mo\u017cna wywo\u0142a\u0107 deleteRow() na wstawianym rekordzie.";
+    t[227] = "Nie można wywołać deleteRow() na wstawianym rekordzie.";
     t[240] = "Conversion of money failed.";
-    t[241] = "Konwersja typu money nie powiod\u0142a si\u0119.";
+    t[241] = "Konwersja typu money nie powiodła się.";
     t[244] = "Internal Position: {0}";
-    t[245] = "Wewn\u0119trzna Pozycja: {0}";
+    t[245] = "Wewnętrzna Pozycja: {0}";
     t[248] = "Connection has been closed.";
-    t[249] = "Po\u0142\u0105czenie zosta\u0142o zamkni\u0119te.";
+    t[249] = "Połączenie zostało zamknięte.";
     t[254] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[255] = "Aktualna pozycja przed pocz\u0105tkiem ResultSet. Nie mo\u017cna wywo\u0142a\u0107 deleteRow().";
+    t[255] = "Aktualna pozycja przed początkiem ResultSet. Nie można wywołać deleteRow().";
     t[258] = "Failed to create object for: {0}.";
-    t[259] = "Nie powiod\u0142o si\u0119 utworzenie obiektu dla: {0}.";
+    t[259] = "Nie powiodło się utworzenie obiektu dla: {0}.";
     t[262] = "Fetch size must be a value greater to or equal to 0.";
-    t[263] = "Rozmiar pobierania musi by\u0107 warto\u015bci\u0105 dodatni\u0105 lub 0.";
+    t[263] = "Rozmiar pobierania musi być wartością dodatnią lub 0.";
     t[270] = "No results were returned by the query.";
-    t[271] = "Zapytanie nie zwr\u00f3ci\u0142o \u017cadnych wynik\u00f3w.";
+    t[271] = "Zapytanie nie zwróciło żadnych wyników.";
     t[276] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[277] = "Uwierzytelnienie typu {0} nie jest obs\u0142ugiwane. Upewnij si\u0119, \u017ce skonfigurowa\u0142e\u015b plik pg_hba.conf tak, \u017ce zawiera on adres IP lub podsie\u0107 klienta oraz \u017ce u\u017cyta metoda uwierzytelnienia jest wspierana przez ten sterownik.";
+    t[277] = "Uwierzytelnienie typu {0} nie jest obsługiwane. Upewnij się, że skonfigurowałeś plik pg_hba.conf tak, że zawiera on adres IP lub podsieć klienta oraz że użyta metoda uwierzytelnienia jest wspierana przez ten sterownik.";
     t[280] = "Conversion to type {0} failed: {1}.";
-    t[281] = "Konwersja do typu {0} nie powiod\u0142a si\u0119: {1}.";
+    t[281] = "Konwersja do typu {0} nie powiodła się: {1}.";
     t[282] = "A result was returned when none was expected.";
-    t[283] = "Zwr\u00f3cono wynik zapytania, cho\u0107 nie by\u0142 on oczekiwany.";
+    t[283] = "Zwrócono wynik zapytania, choć nie był on oczekiwany.";
     t[292] = "Transaction isolation level {0} not supported.";
-    t[293] = "Poziom izolacji transakcji {0} nie jest obs\u0142ugiwany.";
+    t[293] = "Poziom izolacji transakcji {0} nie jest obsługiwany.";
     t[306] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[307] = "Z\u0142a pozycja w ResultSet, mo\u017ce musisz wywo\u0142a\u0107 next.";
+    t[307] = "Zła pozycja w ResultSet, może musisz wywołać next.";
     t[308] = "Location: File: {0}, Routine: {1}, Line: {2}";
     t[309] = "Lokalizacja: Plik: {0}, Procedura: {1}, Linia: {2}";
     t[314] = "An unexpected result was returned by a query.";
-    t[315] = "Zapytanie zwr\u00f3ci\u0142o nieoczekiwany wynik.";
+    t[315] = "Zapytanie zwróciło nieoczekiwany wynik.";
     t[316] = "The column index is out of range: {0}, number of columns: {1}.";
     t[317] = "Indeks kolumny jest poza zakresem: {0}, liczba kolumn: {1}.";
     t[318] = "Expected command status BEGIN, got {0}.";
-    t[319] = "Spodziewano si\u0119 statusu komendy BEGIN, otrzymano {0}.";
+    t[319] = "Spodziewano się statusu komendy BEGIN, otrzymano {0}.";
     t[320] = "The fastpath function {0} is unknown.";
     t[321] = "Funkcja fastpath {0} jest nieznana.";
     t[324] = "The server requested password-based authentication, but no password was provided.";
-    t[325] = "Serwer za\u017c\u0105da\u0142 uwierzytelnienia opartego na ha\u015ble, ale \u017cadne has\u0142o nie zosta\u0142o dostarczone.";
+    t[325] = "Serwer zażądał uwierzytelnienia opartego na haśle, ale żadne hasło nie zostało dostarczone.";
     t[332] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[333] = "Indeks tablicy jest poza zakresem: {0}, liczba element\u00f3w: {1}.";
+    t[333] = "Indeks tablicy jest poza zakresem: {0}, liczba elementów: {1}.";
     t[338] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[339] = "Co\u015b niezwyk\u0142ego spowodowa\u0142o pad sterownika. Prosz\u0119, zg\u0142o\u015b ten wyj\u0105tek.";
+    t[339] = "Coś niezwykłego spowodowało pad sterownika. Proszę, zgłoś ten wyjątek.";
     t[342] = "Zero bytes may not occur in string parameters.";
-    t[343] = "Zerowe bajty nie mog\u0105 pojawia\u0107 si\u0119 w parametrach typu \u0142a\u0144cuch znakowy.";
+    t[343] = "Zerowe bajty nie mogą pojawiać się w parametrach typu łańcuch znakowy.";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages.pot libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages.pot
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages.pot	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages.pot	2018-08-27 15:38:30.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:59+0300\n"
+""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
 msgstr ""
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr ""
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr ""
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr ""
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -90,6 +90,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -110,7 +115,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr ""
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -166,62 +171,62 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
 "that the postmaster is accepting TCP/IP connections."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -229,16 +234,16 @@
 "it is using an authentication scheme supported by the driver."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr ""
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -246,174 +251,169 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 msgid "An I/O error occurred while sending to the backend."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 msgid "An error occurred while trying to get the socket timeout."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
 "requires client_encoding to be UTF8 for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
 "requires DateStyle to begin with ISO for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -471,36 +471,36 @@
 msgid "Unsupported property name: {0}"
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr ""
@@ -566,63 +566,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr ""
@@ -641,17 +648,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -662,67 +669,67 @@
 "SQL_ASCII database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
 "type {1} however type {2} was registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr ""
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -734,124 +741,124 @@
 msgid "No results were returned by the query."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 msgid "This connection has been closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, java-format
 msgid "Invalid elements {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr ""
 
@@ -865,46 +872,46 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 msgid "Unable to find keywords in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -913,83 +920,83 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1005,8 +1012,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr ""
@@ -1018,7 +1025,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr ""
@@ -1057,8 +1064,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr ""
@@ -1072,7 +1079,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1089,68 +1096,68 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
 "the JDBC 2.1 API Specification, section 5.6 for more details."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr ""
@@ -1214,33 +1221,33 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr ""
@@ -1253,31 +1260,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr ""
 
@@ -1311,33 +1318,33 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 msgid "An error occurred reading the certificate"
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1472,128 +1479,128 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_pt_BR.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_pt_BR.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_pt_BR.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_pt_BR.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,349 +5,349 @@
   static {
     java.lang.String[] t = new java.lang.String[794];
     t[0] = "";
-    t[1] = "Project-Id-Version: PostgreSQL 8.4\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2004-10-31 20:48-0300\nLast-Translator: Euler Taveira de Oliveira <euler@timbira.com>\nLanguage-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\nLanguage: pt_BR\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
+    t[1] = "Project-Id-Version: PostgreSQL 8.4\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2004-10-31 20:48-0300\nLast-Translator: Euler Taveira de Oliveira <euler@timbira.com>\nLanguage-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\nLanguage: pt_BR\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n";
     t[4] = "DataSource has been closed.";
     t[5] = "DataSource foi fechado.";
     t[8] = "Invalid flags {0}";
-    t[9] = "Marcadores={0} inv\u00e1lidos";
+    t[9] = "Marcadores={0} inválidos";
     t[18] = "Where: {0}";
     t[19] = "Onde: {0}";
     t[24] = "Unknown XML Source class: {0}";
     t[25] = "Classe XML Source desconhecida: {0}";
     t[26] = "The connection attempt failed.";
-    t[27] = "A tentativa de conex\u00e3o falhou.";
+    t[27] = "A tentativa de conexão falhou.";
     t[28] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[29] = "Posicionado depois do fim do ResultSet.  Voc\u00ea n\u00e3o pode chamar deleteRow() aqui.";
+    t[29] = "Posicionado depois do fim do ResultSet.  Você não pode chamar deleteRow() aqui.";
     t[32] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[33] = "N\u00e3o pode utilizar m\u00e9todos de consulta que pegam uma consulta de um comando preparado.";
+    t[33] = "Não pode utilizar métodos de consulta que pegam uma consulta de um comando preparado.";
     t[36] = "Multiple ResultSets were returned by the query.";
-    t[37] = "ResultSets m\u00faltiplos foram retornados pela consulta.";
+    t[37] = "ResultSets múltiplos foram retornados pela consulta.";
     t[50] = "Too many update results were returned.";
-    t[51] = "Muitos resultados de atualiza\u00e7\u00e3o foram retornados.";
+    t[51] = "Muitos resultados de atualização foram retornados.";
     t[58] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[59] = "Sequ\u00eancia UTF-8 ilegal: byte inicial \u00e9 {0}: {1}";
+    t[59] = "Sequência UTF-8 ilegal: byte inicial é {0}: {1}";
     t[66] = "The column name {0} was not found in this ResultSet.";
-    t[67] = "A nome da coluna {0} n\u00e3o foi encontrado neste ResultSet.";
+    t[67] = "A nome da coluna {0} não foi encontrado neste ResultSet.";
     t[70] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[71] = "Chamada ao Fastpath {0} - Nenhum resultado foi retornado e n\u00f3s esper\u00e1vamos um inteiro.";
+    t[71] = "Chamada ao Fastpath {0} - Nenhum resultado foi retornado e nós esperávamos um inteiro.";
     t[74] = "Protocol error.  Session setup failed.";
-    t[75] = "Erro de Protocolo. Configura\u00e7\u00e3o da sess\u00e3o falhou.";
+    t[75] = "Erro de Protocolo. Configuração da sessão falhou.";
     t[76] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[77] = "Uma fun\u00e7\u00e3o foi declarada mas nenhuma chamada a registerOutParameter (1, <algum_tipo>) foi feita.";
+    t[77] = "Uma função foi declarada mas nenhuma chamada a registerOutParameter (1, <algum_tipo>) foi feita.";
     t[78] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[79] = "ResultSets com CONCUR_READ_ONLY concorrentes n\u00e3o podem ser atualizados.";
+    t[79] = "ResultSets com CONCUR_READ_ONLY concorrentes não podem ser atualizados.";
     t[90] = "LOB positioning offsets start at 1.";
-    t[91] = "Deslocamentos da posi\u00e7\u00e3o de LOB come\u00e7am em 1.";
+    t[91] = "Deslocamentos da posição de LOB começam em 1.";
     t[92] = "Internal Position: {0}";
-    t[93] = "Posi\u00e7\u00e3o Interna: {0}";
+    t[93] = "Posição Interna: {0}";
     t[96] = "free() was called on this LOB previously";
-    t[97] = "free() j\u00e1 foi chamado neste LOB";
+    t[97] = "free() já foi chamado neste LOB";
     t[100] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[101] = "N\u00e3o pode mudar propriedade somente-leitura da transa\u00e7\u00e3o no meio de uma transa\u00e7\u00e3o.";
+    t[101] = "Não pode mudar propriedade somente-leitura da transação no meio de uma transação.";
     t[102] = "The JVM claims not to support the {0} encoding.";
-    t[103] = "A JVM reclamou que n\u00e3o suporta a codifica\u00e7\u00e3o {0}.";
+    t[103] = "A JVM reclamou que não suporta a codificação {0}.";
     t[108] = "{0} function doesn''t take any argument.";
-    t[109] = "fun\u00e7\u00e3o {0} n\u00e3o recebe nenhum argumento.";
+    t[109] = "função {0} não recebe nenhum argumento.";
     t[112] = "xid must not be null";
-    t[113] = "xid n\u00e3o deve ser nulo";
+    t[113] = "xid não deve ser nulo";
     t[114] = "Connection has been closed.";
-    t[115] = "Conex\u00e3o foi fechada.";
+    t[115] = "Conexão foi fechada.";
     t[122] = "The server does not support SSL.";
-    t[123] = "O servidor n\u00e3o suporta SSL.";
+    t[123] = "O servidor não suporta SSL.";
     t[124] = "Custom type maps are not supported.";
-    t[125] = "Mapeamento de tipos personalizados n\u00e3o s\u00e3o suportados.";
+    t[125] = "Mapeamento de tipos personalizados não são suportados.";
     t[140] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[141] = "Sequ\u00eancia UTF-8 ilegal: byte {0} da sequ\u00eancia de bytes {1} n\u00e3o \u00e9 10xxxxxx: {2}";
+    t[141] = "Sequência UTF-8 ilegal: byte {0} da sequência de bytes {1} não é 10xxxxxx: {2}";
     t[148] = "Hint: {0}";
     t[149] = "Dica: {0}";
     t[152] = "Unable to find name datatype in the system catalogs.";
-    t[153] = "N\u00e3o foi poss\u00edvel encontrar tipo de dado name nos cat\u00e1logos do sistema.";
+    t[153] = "Não foi possível encontrar tipo de dado name nos catálogos do sistema.";
     t[156] = "Unsupported Types value: {0}";
-    t[157] = "Valor de Types n\u00e3o \u00e9 suportado: {0}";
+    t[157] = "Valor de Types não é suportado: {0}";
     t[158] = "Unknown type {0}.";
     t[159] = "Tipo desconhecido {0}.";
     t[166] = "{0} function takes two and only two arguments.";
-    t[167] = "fun\u00e7\u00e3o {0} recebe somente dois argumentos.";
+    t[167] = "função {0} recebe somente dois argumentos.";
     t[170] = "Finalizing a Connection that was never closed:";
-    t[171] = "Fechando uma Conex\u00e3o que n\u00e3o foi fechada:";
+    t[171] = "Fechando uma Conexão que não foi fechada:";
     t[180] = "The maximum field size must be a value greater than or equal to 0.";
-    t[181] = "O tamanho m\u00e1ximo de um campo deve ser um valor maior ou igual a 0.";
+    t[181] = "O tamanho máximo de um campo deve ser um valor maior ou igual a 0.";
     t[186] = "PostgreSQL LOBs can only index to: {0}";
-    t[187] = "LOBs do PostgreSQL s\u00f3 podem indexar at\u00e9: {0}";
+    t[187] = "LOBs do PostgreSQL só podem indexar até: {0}";
     t[194] = "Method {0} is not yet implemented.";
-    t[195] = "M\u00e9todo {0} ainda n\u00e3o foi implementado.";
+    t[195] = "Método {0} ainda não foi implementado.";
     t[198] = "Error loading default settings from driverconfig.properties";
-    t[199] = "Erro ao carregar configura\u00e7\u00f5es padr\u00e3o do driverconfig.properties";
+    t[199] = "Erro ao carregar configurações padrão do driverconfig.properties";
     t[200] = "Results cannot be retrieved from a CallableStatement before it is executed.";
-    t[201] = "Resultados n\u00e3o podem ser recuperados de uma fun\u00e7\u00e3o antes dela ser executada.";
+    t[201] = "Resultados não podem ser recuperados de uma função antes dela ser executada.";
     t[202] = "Large Objects may not be used in auto-commit mode.";
-    t[203] = "Objetos Grandes n\u00e3o podem ser usados no modo de efetiva\u00e7\u00e3o autom\u00e1tica (auto-commit).";
+    t[203] = "Objetos Grandes não podem ser usados no modo de efetivação automática (auto-commit).";
     t[208] = "Expected command status BEGIN, got {0}.";
     t[209] = "Status do comando BEGIN esperado, recebeu {0}.";
     t[218] = "Invalid fetch direction constant: {0}.";
-    t[219] = "Constante de dire\u00e7\u00e3o da busca \u00e9 inv\u00e1lida: {0}.";
+    t[219] = "Constante de direção da busca é inválida: {0}.";
     t[222] = "{0} function takes three and only three arguments.";
-    t[223] = "fun\u00e7\u00e3o {0} recebe tr\u00eas e somente tr\u00eas argumentos.";
+    t[223] = "função {0} recebe três e somente três argumentos.";
     t[226] = "This SQLXML object has already been freed.";
-    t[227] = "Este objeto SQLXML j\u00e1 foi liberado.";
+    t[227] = "Este objeto SQLXML já foi liberado.";
     t[228] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[229] = "N\u00e3o pode atualizar o ResultSet porque ele est\u00e1 antes do in\u00edcio ou depois do fim dos resultados.";
+    t[229] = "Não pode atualizar o ResultSet porque ele está antes do início ou depois do fim dos resultados.";
     t[230] = "The JVM claims not to support the encoding: {0}";
-    t[231] = "A JVM reclamou que n\u00e3o suporta a codifica\u00e7\u00e3o: {0}";
+    t[231] = "A JVM reclamou que não suporta a codificação: {0}";
     t[232] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[233] = "Par\u00e2metro do tipo {0} foi registrado, mas uma chamada a get{1} (tiposql={2}) foi feita.";
+    t[233] = "Parâmetro do tipo {0} foi registrado, mas uma chamada a get{1} (tiposql={2}) foi feita.";
     t[240] = "Cannot establish a savepoint in auto-commit mode.";
-    t[241] = "N\u00e3o pode estabelecer um savepoint no modo de efetiva\u00e7\u00e3o autom\u00e1tica (auto-commit).";
+    t[241] = "Não pode estabelecer um savepoint no modo de efetivação automática (auto-commit).";
     t[242] = "Cannot retrieve the id of a named savepoint.";
-    t[243] = "N\u00e3o pode recuperar o id de um savepoint com nome.";
+    t[243] = "Não pode recuperar o id de um savepoint com nome.";
     t[244] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[245] = "O \u00edndice da coluna est\u00e1 fora do intervalo: {0}, n\u00famero de colunas: {1}.";
+    t[245] = "O índice da coluna está fora do intervalo: {0}, número de colunas: {1}.";
     t[250] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[251] = "Alguma coisa n\u00e3o usual ocorreu para causar a falha do driver. Por favor reporte esta exce\u00e7\u00e3o.";
+    t[251] = "Alguma coisa não usual ocorreu para causar a falha do driver. Por favor reporte esta exceção.";
     t[260] = "Cannot cast an instance of {0} to type {1}";
-    t[261] = "N\u00e3o pode converter uma inst\u00e2ncia de {0} para tipo {1}";
+    t[261] = "Não pode converter uma instância de {0} para tipo {1}";
     t[264] = "Unknown Types value.";
     t[265] = "Valor de Types desconhecido.";
     t[266] = "Invalid stream length {0}.";
-    t[267] = "Tamanho de dado {0} \u00e9 inv\u00e1lido.";
+    t[267] = "Tamanho de dado {0} é inválido.";
     t[272] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[273] = "N\u00e3o pode recuperar o nome de um savepoint sem nome.";
+    t[273] = "Não pode recuperar o nome de um savepoint sem nome.";
     t[274] = "Unable to translate data into the desired encoding.";
-    t[275] = "N\u00e3o foi poss\u00edvel traduzir dado para codifica\u00e7\u00e3o desejada.";
+    t[275] = "Não foi possível traduzir dado para codificação desejada.";
     t[276] = "Expected an EOF from server, got: {0}";
     t[277] = "Esperado um EOF do servidor, recebido: {0}";
     t[278] = "Bad value for type {0} : {1}";
-    t[279] = "Valor inv\u00e1lido para tipo {0} : {1}";
+    t[279] = "Valor inválido para tipo {0} : {1}";
     t[280] = "The server requested password-based authentication, but no password was provided.";
-    t[281] = "O servidor pediu autentica\u00e7\u00e3o baseada em senha, mas nenhuma senha foi fornecida.";
+    t[281] = "O servidor pediu autenticação baseada em senha, mas nenhuma senha foi fornecida.";
     t[286] = "Unable to create SAXResult for SQLXML.";
-    t[287] = "N\u00e3o foi poss\u00edvel criar SAXResult para SQLXML.";
+    t[287] = "Não foi possível criar SAXResult para SQLXML.";
     t[292] = "Error during recover";
-    t[293] = "Erro durante recupera\u00e7\u00e3o";
+    t[293] = "Erro durante recuperação";
     t[294] = "tried to call end without corresponding start call. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
     t[295] = "tentou executar end sem a chamada ao start correspondente. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
     t[296] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[297] = "Truncar objetos grandes s\u00f3 \u00e9 implementado por servidores 8.3 ou superiores.";
+    t[297] = "Truncar objetos grandes só é implementado por servidores 8.3 ou superiores.";
     t[298] = "This PooledConnection has already been closed.";
-    t[299] = "Este PooledConnection j\u00e1 foi fechado.";
+    t[299] = "Este PooledConnection já foi fechado.";
     t[302] = "ClientInfo property not supported.";
-    t[303] = "propriedade ClientInfo n\u00e3o \u00e9 suportada.";
+    t[303] = "propriedade ClientInfo não é suportada.";
     t[306] = "Fetch size must be a value greater to or equal to 0.";
     t[307] = "Tamanho da busca deve ser um valor maior ou igual a 0.";
     t[312] = "A connection could not be made using the requested protocol {0}.";
-    t[313] = "A conex\u00e3o n\u00e3o pode ser feita usando protocolo informado {0}.";
+    t[313] = "A conexão não pode ser feita usando protocolo informado {0}.";
     t[318] = "Unknown XML Result class: {0}";
     t[319] = "Classe XML Result desconhecida: {0}";
     t[322] = "There are no rows in this ResultSet.";
-    t[323] = "N\u00e3o h\u00e1 nenhum registro neste ResultSet.";
+    t[323] = "Não há nenhum registro neste ResultSet.";
     t[324] = "Unexpected command status: {0}.";
     t[325] = "Status do comando inesperado: {0}.";
     t[330] = "Heuristic commit/rollback not supported. forget xid={0}";
-    t[331] = "Efetiva\u00e7\u00e3o/Cancelamento heur\u00edstico n\u00e3o \u00e9 suportado. forget xid={0}";
+    t[331] = "Efetivação/Cancelamento heurístico não é suportado. forget xid={0}";
     t[334] = "Not on the insert row.";
-    t[335] = "N\u00e3o est\u00e1 inserindo um registro.";
+    t[335] = "Não está inserindo um registro.";
     t[336] = "This SQLXML object has already been initialized, so you cannot manipulate it further.";
-    t[337] = "Este objeto SQLXML j\u00e1 foi inicializado, ent\u00e3o voc\u00ea n\u00e3o pode manipul\u00e1-lo depois.";
+    t[337] = "Este objeto SQLXML já foi inicializado, então você não pode manipulá-lo depois.";
     t[344] = "Server SQLState: {0}";
     t[345] = "SQLState: {0}";
     t[348] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
-    t[349] = "O par\u00e2metro do servidor standard_conforming_strings foi definido como {0}. O driver JDBC espera que seja on ou off.";
+    t[349] = "O parâmetro do servidor standard_conforming_strings foi definido como {0}. O driver JDBC espera que seja on ou off.";
     t[360] = "The driver currently does not support COPY operations.";
-    t[361] = "O driver atualmente n\u00e3o suporta opera\u00e7\u00f5es COPY.";
+    t[361] = "O driver atualmente não suporta operações COPY.";
     t[364] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[365] = "O \u00edndice da matriz est\u00e1 fora do intervalo: {0}, n\u00famero de elementos: {1}.";
+    t[365] = "O índice da matriz está fora do intervalo: {0}, número de elementos: {1}.";
     t[374] = "suspend/resume not implemented";
-    t[375] = "suspender/recome\u00e7ar n\u00e3o est\u00e1 implementado";
+    t[375] = "suspender/recomeçar não está implementado";
     t[378] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
-    t[379] = "N\u00e3o est\u00e1 implementado: efetivada da primeira fase deve ser executada utilizando a mesma conex\u00e3o que foi utilizada para inici\u00e1-la";
+    t[379] = "Não está implementado: efetivada da primeira fase deve ser executada utilizando a mesma conexão que foi utilizada para iniciá-la";
     t[380] = "Error during one-phase commit. commit xid={0}";
-    t[381] = "Erro durante efetiva\u00e7\u00e3o de uma fase. commit xid={0}";
+    t[381] = "Erro durante efetivação de uma fase. commit xid={0}";
     t[398] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[399] = "N\u00e3o pode chamar cancelRowUpdates() quando estiver inserindo registro.";
+    t[399] = "Não pode chamar cancelRowUpdates() quando estiver inserindo registro.";
     t[400] = "Cannot reference a savepoint after it has been released.";
-    t[401] = "N\u00e3o pode referenciar um savepoint ap\u00f3s ele ser descartado.";
+    t[401] = "Não pode referenciar um savepoint após ele ser descartado.";
     t[402] = "You must specify at least one column value to insert a row.";
-    t[403] = "Voc\u00ea deve especificar pelo menos uma coluna para inserir um registro.";
+    t[403] = "Você deve especificar pelo menos uma coluna para inserir um registro.";
     t[404] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[405] = "N\u00e3o foi poss\u00edvel determinar um valor para MaxIndexKeys por causa de falta de dados no cat\u00e1logo do sistema.";
+    t[405] = "Não foi possível determinar um valor para MaxIndexKeys por causa de falta de dados no catálogo do sistema.";
     t[410] = "commit called before end. commit xid={0}, state={1}";
     t[411] = "commit executado antes do end. commit xid={0}, state={1}";
     t[412] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[413] = "Sequ\u00eancia UTF-8 ilegal: valor final est\u00e1 fora do intervalo: {0}";
+    t[413] = "Sequência UTF-8 ilegal: valor final está fora do intervalo: {0}";
     t[414] = "{0} function takes two or three arguments.";
-    t[415] = "fun\u00e7\u00e3o {0} recebe dois ou tr\u00eas argumentos.";
+    t[415] = "função {0} recebe dois ou três argumentos.";
     t[428] = "Unable to convert DOMResult SQLXML data to a string.";
-    t[429] = "N\u00e3o foi poss\u00edvel converter dado SQLXML do DOMResult para uma cadeia de caracteres.";
+    t[429] = "Não foi possível converter dado SQLXML do DOMResult para uma cadeia de caracteres.";
     t[434] = "Unable to decode xml data.";
-    t[435] = "N\u00e3o foi poss\u00edvel decodificar dado xml.";
+    t[435] = "Não foi possível decodificar dado xml.";
     t[440] = "Unexpected error writing large object to database.";
     t[441] = "Erro inesperado ao escrever objeto grande no banco de dados.";
     t[442] = "Zero bytes may not occur in string parameters.";
-    t[443] = "Zero bytes n\u00e3o podem ocorrer em par\u00e2metros de cadeia de caracteres.";
+    t[443] = "Zero bytes não podem ocorrer em parâmetros de cadeia de caracteres.";
     t[444] = "A result was returned when none was expected.";
     t[445] = "Um resultado foi retornado quando nenhum era esperado.";
     t[446] = "Not implemented: 2nd phase commit must be issued using an idle connection. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
-    t[447] = "N\u00e3o est\u00e1 implementado: efetiva\u00e7\u00e3o da segunda fase deve ser executada utilizado uma conex\u00e3o ociosa. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
+    t[447] = "Não está implementado: efetivação da segunda fase deve ser executada utilizado uma conexão ociosa. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
     t[450] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[451] = "ResultSet n\u00e3o \u00e9 atualiz\u00e1vel. A consulta que gerou esse conjunto de resultados deve selecionar somente uma tabela, e deve selecionar todas as chaves prim\u00e1rias daquela tabela. Veja a especifica\u00e7\u00e3o na API do JDBC 2.1, se\u00e7\u00e3o 5.6 para obter mais detalhes.";
+    t[451] = "ResultSet não é atualizável. A consulta que gerou esse conjunto de resultados deve selecionar somente uma tabela, e deve selecionar todas as chaves primárias daquela tabela. Veja a especificação na API do JDBC 2.1, seção 5.6 para obter mais detalhes.";
     t[454] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[455] = "Tamanho de mensagem de liga\u00e7\u00e3o {0} \u00e9 muito longo. Isso pode ser causado por especifica\u00e7\u00f5es de tamanho incorretas ou muito grandes nos par\u00e2metros do InputStream.";
+    t[455] = "Tamanho de mensagem de ligação {0} é muito longo. Isso pode ser causado por especificações de tamanho incorretas ou muito grandes nos parâmetros do InputStream.";
     t[460] = "Statement has been closed.";
     t[461] = "Comando foi fechado.";
     t[462] = "No value specified for parameter {0}.";
-    t[463] = "Nenhum valor especificado para par\u00e2metro {0}.";
+    t[463] = "Nenhum valor especificado para parâmetro {0}.";
     t[468] = "The array index is out of range: {0}";
-    t[469] = "O \u00edndice da matriz est\u00e1 fora do intervalo: {0}";
+    t[469] = "O índice da matriz está fora do intervalo: {0}";
     t[474] = "Unable to bind parameter values for statement.";
-    t[475] = "N\u00e3o foi poss\u00edvel ligar valores de par\u00e2metro ao comando.";
+    t[475] = "Não foi possível ligar valores de parâmetro ao comando.";
     t[476] = "Can''t refresh the insert row.";
-    t[477] = "N\u00e3o pode renovar um registro inserido.";
+    t[477] = "Não pode renovar um registro inserido.";
     t[480] = "No primary key found for table {0}.";
-    t[481] = "Nenhuma chave prim\u00e1ria foi encontrada para tabela {0}.";
+    t[481] = "Nenhuma chave primária foi encontrada para tabela {0}.";
     t[482] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[483] = "N\u00e3o pode mudar n\u00edvel de isolamento da transa\u00e7\u00e3o no meio de uma transa\u00e7\u00e3o.";
+    t[483] = "Não pode mudar nível de isolamento da transação no meio de uma transação.";
     t[498] = "Provided InputStream failed.";
     t[499] = "InputStream fornecido falhou.";
     t[500] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[501] = "O \u00edndice de par\u00e2metro est\u00e1 fora do intervalo: {0}, n\u00famero de par\u00e2metros: {1}.";
+    t[501] = "O índice de parâmetro está fora do intervalo: {0}, número de parâmetros: {1}.";
     t[502] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[503] = "O par\u00e2metro do servidor DateStyle foi alterado para {0}. O driver JDBC requer que o DateStyle come\u00e7e com ISO para opera\u00e7\u00e3o normal.";
+    t[503] = "O parâmetro do servidor DateStyle foi alterado para {0}. O driver JDBC requer que o DateStyle começe com ISO para operação normal.";
     t[508] = "Connection attempt timed out.";
-    t[509] = "Tentativa de conex\u00e3o falhou.";
+    t[509] = "Tentativa de conexão falhou.";
     t[512] = "Internal Query: {0}";
     t[513] = "Consulta Interna: {0}";
     t[514] = "Error preparing transaction. prepare xid={0}";
-    t[515] = "Erro ao preparar transa\u00e7\u00e3o. prepare xid={0}";
+    t[515] = "Erro ao preparar transação. prepare xid={0}";
     t[518] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[519] = "O tipo de autentica\u00e7\u00e3o {0} n\u00e3o \u00e9 suportado. Verifique se voc\u00ea configurou o arquivo pg_hba.conf incluindo a subrede ou endere\u00e7o IP do cliente, e se est\u00e1 utilizando o esquema de autentica\u00e7\u00e3o suportado pelo driver.";
+    t[519] = "O tipo de autenticação {0} não é suportado. Verifique se você configurou o arquivo pg_hba.conf incluindo a subrede ou endereço IP do cliente, e se está utilizando o esquema de autenticação suportado pelo driver.";
     t[526] = "Interval {0} not yet implemented";
-    t[527] = "Intervalo {0} ainda n\u00e3o foi implementado";
+    t[527] = "Intervalo {0} ainda não foi implementado";
     t[532] = "Conversion of interval failed";
-    t[533] = "Convers\u00e3o de interval falhou";
+    t[533] = "Conversão de interval falhou";
     t[540] = "Query timeout must be a value greater than or equals to 0.";
     t[541] = "Tempo de espera da consulta deve ser um valor maior ou igual a 0.";
     t[542] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[543] = "Conex\u00e3o foi fechada automaticamente porque uma nova conex\u00e3o foi aberta pelo mesmo PooledConnection ou o PooledConnection foi fechado.";
+    t[543] = "Conexão foi fechada automaticamente porque uma nova conexão foi aberta pelo mesmo PooledConnection ou o PooledConnection foi fechado.";
     t[544] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[545] = "ResultSet n\u00e3o est\u00e1 posicionado corretamente, talvez voc\u00ea precise chamar next.";
+    t[545] = "ResultSet não está posicionado corretamente, talvez você precise chamar next.";
     t[546] = "Prepare called before end. prepare xid={0}, state={1}";
     t[547] = "Prepare executado antes do end. prepare xid={0}, state={1}";
     t[548] = "Invalid UUID data.";
-    t[549] = "dado UUID \u00e9 inv\u00e1lido.";
+    t[549] = "dado UUID é inválido.";
     t[550] = "This statement has been closed.";
     t[551] = "Este comando foi fechado.";
     t[552] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[553] = "N\u00e3o pode inferir um tipo SQL a ser usado para uma inst\u00e2ncia de {0}. Use setObject() com um valor de Types expl\u00edcito para especificar o tipo a ser usado.";
+    t[553] = "Não pode inferir um tipo SQL a ser usado para uma instância de {0}. Use setObject() com um valor de Types explícito para especificar o tipo a ser usado.";
     t[554] = "Cannot call updateRow() when on the insert row.";
-    t[555] = "N\u00e3o pode chamar updateRow() quando estiver inserindo registro.";
+    t[555] = "Não pode chamar updateRow() quando estiver inserindo registro.";
     t[562] = "Detail: {0}";
     t[563] = "Detalhe: {0}";
     t[566] = "Cannot call deleteRow() when on the insert row.";
-    t[567] = "N\u00e3o pode chamar deleteRow() quando estiver inserindo registro.";
+    t[567] = "Não pode chamar deleteRow() quando estiver inserindo registro.";
     t[568] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[569] = "Posicionado antes do in\u00edcio do ResultSet.  Voc\u00ea n\u00e3o pode chamar deleteRow() aqui.";
+    t[569] = "Posicionado antes do início do ResultSet.  Você não pode chamar deleteRow() aqui.";
     t[576] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[577] = "Sequ\u00eancia UTF-8 ilegal: valor final \u00e9 um valor suplementar: {0}";
+    t[577] = "Sequência UTF-8 ilegal: valor final é um valor suplementar: {0}";
     t[578] = "Unknown Response Type {0}.";
     t[579] = "Tipo de Resposta Desconhecido {0}.";
     t[582] = "Unsupported value for stringtype parameter: {0}";
-    t[583] = "Valor do par\u00e2metro stringtype n\u00e3o \u00e9 suportado: {0}";
+    t[583] = "Valor do parâmetro stringtype não é suportado: {0}";
     t[584] = "Conversion to type {0} failed: {1}.";
-    t[585] = "Convers\u00e3o para tipo {0} falhou: {1}.";
+    t[585] = "Conversão para tipo {0} falhou: {1}.";
     t[586] = "This SQLXML object has not been initialized, so you cannot retrieve data from it.";
-    t[587] = "Este objeto SQLXML n\u00e3o foi inicializado, ent\u00e3o voc\u00ea n\u00e3o pode recuperar dados dele.";
+    t[587] = "Este objeto SQLXML não foi inicializado, então você não pode recuperar dados dele.";
     t[600] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[601] = "N\u00e3o foi poss\u00edvel carregar a classe {0} respons\u00e1vel pelo tipo de dado {1}";
+    t[601] = "Não foi possível carregar a classe {0} responsável pelo tipo de dado {1}";
     t[604] = "The fastpath function {0} is unknown.";
-    t[605] = "A fun\u00e7\u00e3o do fastpath {0} \u00e9 desconhecida.";
+    t[605] = "A função do fastpath {0} é desconhecida.";
     t[608] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[609] = "Sintaxe de escape mal formada da fun\u00e7\u00e3o ou do procedimento no deslocamento {0}.";
+    t[609] = "Sintaxe de escape mal formada da função ou do procedimento no deslocamento {0}.";
     t[612] = "Provided Reader failed.";
     t[613] = "Reader fornecido falhou.";
     t[614] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[615] = "N\u00famero m\u00e1ximo de registros deve ser um valor maior ou igual a 0.";
+    t[615] = "Número máximo de registros deve ser um valor maior ou igual a 0.";
     t[616] = "Failed to create object for: {0}.";
     t[617] = "Falhou ao criar objeto para: {0}.";
     t[620] = "Conversion of money failed.";
-    t[621] = "Convers\u00e3o de money falhou.";
+    t[621] = "Conversão de money falhou.";
     t[622] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
     t[623] = "Fim de entrada prematuro, eram esperados {0} bytes, mas somente {1} foram lidos.";
     t[626] = "An unexpected result was returned by a query.";
     t[627] = "Um resultado inesperado foi retornado pela consulta.";
     t[644] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
-    t[645] = "Intercala\u00e7\u00e3o de transa\u00e7\u00e3o n\u00e3o est\u00e1 implementado. xid={0}, currentXid={1}, state={2}, flags={3}";
+    t[645] = "Intercalação de transação não está implementado. xid={0}, currentXid={1}, state={2}, flags={3}";
     t[646] = "An error occurred while setting up the SSL connection.";
-    t[647] = "Um erro ocorreu ao estabelecer uma conex\u00e3o SSL.";
+    t[647] = "Um erro ocorreu ao estabelecer uma conexão SSL.";
     t[654] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
-    t[655] = "Sequ\u00eancia UTF-8 ilegal: {0} bytes utilizados para codificar um valor de {1} bytes: {2}";
+    t[655] = "Sequência UTF-8 ilegal: {0} bytes utilizados para codificar um valor de {1} bytes: {2}";
     t[656] = "Not implemented: Prepare must be issued using the same connection that started the transaction. currentXid={0}, prepare xid={1}";
-    t[657] = "N\u00e3o est\u00e1 implementado: Prepare deve ser executado utilizando a mesma conex\u00e3o que iniciou a transa\u00e7\u00e3o. currentXid={0}, prepare xid={1}";
+    t[657] = "Não está implementado: Prepare deve ser executado utilizando a mesma conexão que iniciou a transação. currentXid={0}, prepare xid={1}";
     t[658] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[659] = "A classe SSLSocketFactory forneceu {0} que n\u00e3o p\u00f4de ser instanciado.";
+    t[659] = "A classe SSLSocketFactory forneceu {0} que não pôde ser instanciado.";
     t[662] = "Failed to convert binary xml data to encoding: {0}.";
-    t[663] = "Falhou ao converter dados xml bin\u00e1rios para codifica\u00e7\u00e3o: {0}.";
+    t[663] = "Falhou ao converter dados xml binários para codificação: {0}.";
     t[670] = "Position: {0}";
-    t[671] = "Posi\u00e7\u00e3o: {0}";
+    t[671] = "Posição: {0}";
     t[676] = "Location: File: {0}, Routine: {1}, Line: {2}";
     t[677] = "Local: Arquivo: {0}, Rotina: {1}, Linha: {2}";
     t[684] = "Cannot tell if path is open or closed: {0}.";
-    t[685] = "N\u00e3o pode dizer se caminho est\u00e1 aberto ou fechado: {0}.";
+    t[685] = "Não pode dizer se caminho está aberto ou fechado: {0}.";
     t[690] = "Unable to create StAXResult for SQLXML";
-    t[691] = "N\u00e3o foi poss\u00edvel criar StAXResult para SQLXML";
+    t[691] = "Não foi possível criar StAXResult para SQLXML";
     t[700] = "Cannot convert an instance of {0} to type {1}";
-    t[701] = "N\u00e3o pode converter uma inst\u00e2ncia de {0} para tipo {1}";
+    t[701] = "Não pode converter uma instância de {0} para tipo {1}";
     t[710] = "{0} function takes four and only four argument.";
-    t[711] = "fun\u00e7\u00e3o {0} recebe somente quatro argumentos.";
+    t[711] = "função {0} recebe somente quatro argumentos.";
     t[716] = "Error disabling autocommit";
     t[717] = "Erro ao desabilitar autocommit";
     t[718] = "Interrupted while attempting to connect.";
     t[719] = "Interrompido ao tentar se conectar.";
     t[722] = "Your security policy has prevented the connection from being attempted.  You probably need to grant the connect java.net.SocketPermission to the database server host and port that you wish to connect to.";
-    t[723] = "Sua pol\u00edtica de seguran\u00e7a impediu que a conex\u00e3o pudesse ser estabelecida. Voc\u00ea provavelmente precisa conceder permiss\u00e3o em java.net.SocketPermission para a m\u00e1quina e a porta do servidor de banco de dados que voc\u00ea deseja se conectar.";
+    t[723] = "Sua política de segurança impediu que a conexão pudesse ser estabelecida. Você provavelmente precisa conceder permissão em java.net.SocketPermission para a máquina e a porta do servidor de banco de dados que você deseja se conectar.";
     t[728] = "Failed to initialize LargeObject API";
     t[729] = "Falhou ao inicializar API de Objetos Grandes";
     t[734] = "No function outputs were registered.";
-    t[735] = "Nenhum sa\u00edda de fun\u00e7\u00e3o foi registrada.";
+    t[735] = "Nenhum saída de função foi registrada.";
     t[736] = "{0} function takes one and only one argument.";
-    t[737] = "fun\u00e7\u00e3o {0} recebe somente um argumento.";
+    t[737] = "função {0} recebe somente um argumento.";
     t[744] = "This ResultSet is closed.";
-    t[745] = "Este ResultSet est\u00e1 fechado.";
+    t[745] = "Este ResultSet está fechado.";
     t[746] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[747] = "Caracter inv\u00e1lido foi encontrado. Isso \u00e9 mais comumente causado por dado armazenado que cont\u00e9m caracteres que s\u00e3o inv\u00e1lidos para a codifica\u00e7\u00e3o que foi criado o banco de dados. O exemplo mais comum disso \u00e9 armazenar dados de 8 bits em um banco de dados SQL_ASCII.";
+    t[747] = "Caracter inválido foi encontrado. Isso é mais comumente causado por dado armazenado que contém caracteres que são inválidos para a codificação que foi criado o banco de dados. O exemplo mais comum disso é armazenar dados de 8 bits em um banco de dados SQL_ASCII.";
     t[752] = "GSS Authentication failed";
-    t[753] = "Autentica\u00e7\u00e3o GSS falhou";
+    t[753] = "Autenticação GSS falhou";
     t[754] = "Ran out of memory retrieving query results.";
-    t[755] = "Mem\u00f3ria insuficiente ao recuperar resultados da consulta.";
+    t[755] = "Memória insuficiente ao recuperar resultados da consulta.";
     t[756] = "Returning autogenerated keys is not supported.";
-    t[757] = "Retorno de chaves geradas automaticamente n\u00e3o \u00e9 suportado.";
+    t[757] = "Retorno de chaves geradas automaticamente não é suportado.";
     t[760] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[761] = "Opera\u00e7\u00e3o requer um ResultSet rol\u00e1vel, mas este ResultSet \u00e9 FORWARD_ONLY (somente para frente).";
+    t[761] = "Operação requer um ResultSet rolável, mas este ResultSet é FORWARD_ONLY (somente para frente).";
     t[762] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[763] = "Uma fun\u00e7\u00e3o foi executada e o par\u00e2metro de retorno {0} era do tipo {1} contudo tipo {2} foi registrado.";
+    t[763] = "Uma função foi executada e o parâmetro de retorno {0} era do tipo {1} contudo tipo {2} foi registrado.";
     t[764] = "Unable to find server array type for provided name {0}.";
-    t[765] = "N\u00e3o foi poss\u00edvel encontrar tipo matriz para nome fornecido {0}.";
+    t[765] = "Não foi possível encontrar tipo matriz para nome fornecido {0}.";
     t[768] = "Unknown ResultSet holdability setting: {0}.";
-    t[769] = "Defini\u00e7\u00e3o de durabilidade do ResultSet desconhecida: {0}.";
+    t[769] = "Definição de durabilidade do ResultSet desconhecida: {0}.";
     t[772] = "Transaction isolation level {0} not supported.";
-    t[773] = "N\u00edvel de isolamento da transa\u00e7\u00e3o {0} n\u00e3o \u00e9 suportado.";
+    t[773] = "Nível de isolamento da transação {0} não é suportado.";
     t[774] = "Zero bytes may not occur in identifiers.";
-    t[775] = "Zero bytes n\u00e3o podem ocorrer em identificadores.";
+    t[775] = "Zero bytes não podem ocorrer em identificadores.";
     t[776] = "No results were returned by the query.";
     t[777] = "Nenhum resultado foi retornado pela consulta.";
     t[778] = "A CallableStatement was executed with nothing returned.";
-    t[779] = "Uma fun\u00e7\u00e3o foi executada e nada foi retornado.";
+    t[779] = "Uma função foi executada e nada foi retornado.";
     t[780] = "wasNull cannot be call before fetching a result.";
-    t[781] = "wasNull n\u00e3o pode ser chamado antes de obter um resultado.";
+    t[781] = "wasNull não pode ser chamado antes de obter um resultado.";
     t[784] = "Returning autogenerated keys by column index is not supported.";
-    t[785] = "Retorno de chaves geradas automaticamente por \u00edndice de coluna n\u00e3o \u00e9 suportado.";
+    t[785] = "Retorno de chaves geradas automaticamente por índice de coluna não é suportado.";
     t[786] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[787] = "Este comando n\u00e3o declara um par\u00e2metro de sa\u00edda. Utilize '{' ?= chamada ... '}' para declarar um)";
+    t[787] = "Este comando não declara um parâmetro de saída. Utilize '{' ?= chamada ... '}' para declarar um)";
     t[788] = "Can''t use relative move methods while on the insert row.";
-    t[789] = "N\u00e3o pode utilizar m\u00e9todos de movimenta\u00e7\u00e3o relativos enquanto estiver inserindo registro.";
+    t[789] = "Não pode utilizar métodos de movimentação relativos enquanto estiver inserindo registro.";
     t[790] = "A CallableStatement was executed with an invalid number of parameters";
-    t[791] = "Uma fun\u00e7\u00e3o foi executada com um n\u00famero inv\u00e1lido de par\u00e2metros";
+    t[791] = "Uma função foi executada com um número inválido de parâmetros";
     t[792] = "Connection is busy with another transaction";
-    t[793] = "Conex\u00e3o est\u00e1 ocupada com outra transa\u00e7\u00e3o";
+    t[793] = "Conexão está ocupada com outra transação";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_ru.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_ru.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_ru.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_ru.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,217 +5,217 @@
   static {
     java.lang.String[] t = new java.lang.String[554];
     t[0] = "";
-    t[1] = "Project-Id-Version: JDBC Driver for PostgreSQL 8.x.x\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2016-01-07 15:09+0300\nLast-Translator: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>\nLanguage-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\nLanguage: ru_RU\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Poedit 1.5.7\n";
+    t[1] = "Project-Id-Version: JDBC Driver for PostgreSQL 8.x.x\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2016-01-07 15:09+0300\nLast-Translator: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>\nLanguage-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\nLanguage: ru_RU\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Poedit 1.5.7\n";
     t[4] = "The HostnameVerifier class provided {0} could not be instantiated.";
-    t[5] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u0442\u044c HostnameVerifier \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u043a\u043b\u0430\u0441\u0441\u0430 {0}";
+    t[5] = "Невозможно создать HostnameVerifier с помощью указанного класса {0}";
     t[8] = "Unknown Types value.";
-    t[9] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 Types.";
+    t[9] = "Неизвестное значение Types.";
     t[12] = "The column name {0} was not found in this ResultSet.";
-    t[13] = "\u041a\u043e\u043b\u043e\u043d\u043a\u0438 {0} \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u0432 \u044d\u0442\u043e\u043c ResultSet\u2019\u2019\u0435.";
+    t[13] = "Колонки {0} не найдено в этом ResultSet’’е.";
     t[18] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[19] = "\u0418\u043d\u0434\u0435\u043a\u0441 \u043c\u0430\u0441\u0441\u0438\u0432\u0430 \u0432\u043d\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430: {0}. \u0414\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f: 1..{1}";
+    t[19] = "Индекс массива вне диапазона: {0}. Допустимые значения: 1..{1}";
     t[22] = "Error during one-phase commit. commit xid={0}";
-    t[23] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043e\u0434\u043d\u043e\u0444\u0430\u0437\u043d\u043e\u0439 \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438. commit xid={0}";
+    t[23] = "Ошибка при однофазной фиксации транзакции. commit xid={0}";
     t[26] = "An error occurred while setting up the SSL connection.";
-    t[27] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435 SSL-\u043f\u043e\u0434\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f.";
+    t[27] = "Ошибка при установке SSL-подсоединения.";
     t[30] = "Failed to create object for: {0}.";
-    t[31] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u043e\u0431\u044a\u0435\u043a\u0442 \u0434\u043b\u044f: {0}.";
+    t[31] = "Ошибка при создании объект для: {0}.";
     t[32] = "Zero bytes may not occur in string parameters.";
-    t[33] = "\u0411\u0430\u0439\u0442 \u0441 \u043a\u043e\u0434\u043e\u043c 0 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0432\u0442\u0440\u0435\u0447\u0430\u0442\u044c\u0441\u044f \u0432 \u0441\u0442\u0440\u043e\u043a\u043e\u0432\u044b\u0445 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u0445";
+    t[33] = "Байт с кодом 0 не может втречаться в строковых параметрах";
     t[34] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[35] = "\u0421\u043b\u0443\u0447\u0438\u043b\u043e\u0441\u044c \u0447\u0442\u043e-\u0442\u043e \u043d\u0435\u043e\u0431\u044b\u0447\u043d\u043e\u0435, \u0447\u0442\u043e \u0437\u0430\u0441\u0442\u0430\u0432\u0438\u043b\u043e \u0434\u0440\u0430\u0439\u0432\u0435\u0440 \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u043e\u0448\u0438\u0431\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430 \u0441\u043e\u043e\u0431\u0449\u0438\u0442\u0435 \u044d\u0442\u043e \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435.";
+    t[35] = "Случилось что-то необычное, что заставило драйвер произвести ошибку. Пожалуйста сообщите это исключение.";
     t[38] = "Unsupported Types value: {0}";
-    t[39] = "\u041d\u0435\u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u044b\u0439 java.sql.Types \u0442\u0438\u043f: {0}";
+    t[39] = "Неподдерживаемый java.sql.Types тип: {0}";
     t[48] = "No IOException expected from StringBuffer or StringBuilder";
-    t[49] = "\u0427\u0442\u043e-\u0442\u043e \u043f\u043e\u0448\u043b\u043e \u043d\u0435 \u0442\u0430\u043a: \u0438\u0437 \u043a\u043b\u0430\u0441\u0441\u043e\u0432 StringBuffer \u0438 StringBuilder \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439 \u043d\u0435 \u043e\u0436\u0438\u0434\u0430\u043b\u043e\u0441\u044c";
+    t[49] = "Что-то пошло не так: из классов StringBuffer и StringBuilder исключений не ожидалось";
     t[52] = "The server requested password-based authentication, but no password was provided.";
-    t[53] = "\u0421\u0435\u0440\u0432\u0435\u0440 \u0437\u0430\u043f\u0440\u043e\u0441\u0438\u043b \u043f\u0430\u0440\u043e\u043b\u044c\u043d\u0443\u044e \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e, \u043d\u043e \u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u0431\u044b\u043b \u0443\u043a\u0430\u0437\u0430\u043d.";
+    t[53] = "Сервер запросил парольную аутентификацию, но пароль не был указан.";
     t[54] = "Position: {0}";
-    t[55] = "\u041f\u043e\u0437\u0438\u0446\u0438\u044f: {0}";
+    t[55] = "Позиция: {0}";
     t[60] = "No results were returned by the query.";
-    t[61] = "\u0417\u0430\u043f\u0440\u043e\u0441 \u043d\u0435 \u0432\u0435\u0440\u043d\u0443\u043b \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432.";
+    t[61] = "Запрос не вернул результатов.";
     t[66] = "tried to call end without corresponding start call. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
-    t[67] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e, \u0442.\u043a. \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u043d\u0435 \u0431\u044b\u043b\u0430 \u043d\u0430\u0447\u0430\u0442\u0430. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
+    t[67] = "Невозможно завершить транзакцию, т.к. транзакция не была начата. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
     t[70] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
-    t[71] = "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c UTF-8: {0} bytes used to encode a {1} byte value: {2}";
+    t[71] = "Неверная последовательность UTF-8: {0} bytes used to encode a {1} byte value: {2}";
     t[76] = "Unexpected command status: {0}.";
-    t[77] = "\u041d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u044b\u0439 \u0441\u0442\u0430\u0442\u0443\u0441 \u043a\u043e\u043c\u0430\u043d\u0434\u044b: {0}.";
+    t[77] = "Неожиданный статус команды: {0}.";
     t[82] = "Interval {0} not yet implemented";
-    t[83] = "\u0418\u043d\u0442\u0435\u0432\u0440\u0432\u0430\u043b {0} \u0435\u0449\u0451 \u043d\u0435 \u0440\u0435\u0430\u043b\u0438\u0437\u043e\u0432\u0430\u043d";
+    t[83] = "Интеврвал {0} ещё не реализован";
     t[84] = "Unsupported property name: {0}";
-    t[85] = "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u043e {0} \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f";
+    t[85] = "Свойство {0} не поддерживается";
     t[90] = "A connection could not be made using the requested protocol {0}.";
-    t[91] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430 {0}";
+    t[91] = "Невозможно установить соединение с помощью протокола {0}";
     t[92] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[93] = "\u0422\u0438\u043f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 {0} \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0435\u0441\u043b\u0438 \u0432\u044b \u0441\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043b\u0438 \u0444\u0430\u0439\u043b pg_hba.conf \u0447\u0442\u043e\u0431\u044b \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c IP-\u0430\u0434\u0440\u0435\u0441\u0430 \u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0432 \u0438\u043b\u0438 \u043f\u043e\u0434\u0441\u0435\u0442\u044c. \u0422\u0430\u043a\u0436\u0435 \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0442\u0435\u0441\u044c \u0447\u0442\u043e \u043e\u043d \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u0445\u0435\u043c\u0443 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u0443\u044e \u0434\u0440\u0430\u0439\u0432\u0435\u0440\u043e\u043c.";
+    t[93] = "Тип аутентификации {0} не поддерживается. Проверьте если вы сконфигурировали файл pg_hba.conf чтобы включить IP-адреса клиентов или подсеть. Также удостовертесь что он использует схему аутентификации поддерживаемую драйвером.";
     t[96] = "Protocol error.  Session setup failed.";
-    t[97] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430.  \u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0435\u0441\u0441\u0438\u0438 \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c.";
+    t[97] = "Ошибка протокола.  Установление сессии не удалось.";
     t[100] = "The password callback class provided {0} could not be instantiated.";
-    t[101] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u0442\u044c password callback \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u043a\u043b\u0430\u0441\u0441\u0430 {0}";
+    t[101] = "Невозможно создать password callback с помощью указанного класса {0}";
     t[104] = "suspend/resume not implemented";
-    t[105] = "\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u0438 XA suspend/resume \u043d\u0435 \u0440\u0435\u0430\u043b\u0438\u0437\u043e\u0432\u0430\u043d\u044b";
+    t[105] = "Операции XA suspend/resume не реализованы";
     t[116] = "Fastpath call {0} - No result was returned and we expected a long.";
-    t[117] = "\u0412\u044b\u0437\u043e\u0432 fastpath {0} \u043d\u0438\u0447\u0435\u0433\u043e \u043d\u0435 \u0432\u0435\u0440\u043d\u0443\u043b, \u0430 \u043e\u0436\u0438\u0434\u0430\u043b\u043e\u0441\u044c long";
+    t[117] = "Вызов fastpath {0} ничего не вернул, а ожидалось long";
     t[130] = "Transaction isolation level {0} not supported.";
-    t[131] = "\u0423\u0440\u043e\u0432\u0435\u043d\u044c \u0438\u0437\u043e\u043b\u044f\u0446\u0438\u0438 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0439 {0} \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.";
+    t[131] = "Уровень изоляции транзакций {0} не поддерживается.";
     t[132] = "Large Objects may not be used in auto-commit mode.";
-    t[133] = "\u0411\u043e\u043b\u044c\u0448\u0438\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b \u043d\u0435 \u043c\u043e\u0433\u0443\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0432 \u0440\u0435\u0436\u0438\u043c\u0435 \u0430\u0432\u0442\u043e-\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f (auto-commit).";
+    t[133] = "Большие объекты не могут использоваться в режиме авто-подтверждения (auto-commit).";
     t[134] = "The driver currently does not support COPY operations.";
-    t[135] = "\u0414\u0440\u0430\u0439\u0432\u0435\u0440 \u0432 \u0434\u0430\u043d\u043d\u044b\u0439 \u043c\u043e\u043c\u0435\u043d\u0442 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u0435 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438 COPY.";
+    t[135] = "Драйвер в данный момент не поддерживате операции COPY.";
     t[136] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[137] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0440\u0430\u0437\u043e\u0431\u0440\u0430\u0442\u044c SQL \u043a\u043e\u043c\u0430\u043d\u0434\u0443. \u041e\u0448\u0438\u0431\u043a\u0430 \u043d\u0430 \u043f\u043e\u0437\u0438\u0446\u0438\u0438 {0}";
+    t[137] = "Невозможно разобрать SQL команду. Ошибка на позиции {0}";
     t[138] = "Zero bytes may not occur in identifiers.";
-    t[139] = "\u0421\u0438\u043c\u0432\u043e\u043b \u0441 \u043a\u043e\u0434\u043e\u043c 0 \u0432 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430\u0445 \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c";
+    t[139] = "Символ с кодом 0 в идентификаторах не допустим";
     t[140] = "The array index is out of range: {0}";
-    t[141] = "\u0418\u043d\u0434\u0435\u043a\u0441 \u043c\u0430\u0441\u0441\u0438\u0432\u0430 \u0432\u043d\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430: {0}";
+    t[141] = "Индекс массива вне диапазона: {0}";
     t[142] = "This SQLXML object has already been freed.";
-    t[143] = "\u042d\u0442\u043e\u0442 \u043e\u0431\u044a\u0435\u043a\u0442 SQLXML \u0443\u0436\u0435 \u0431\u044b\u043b \u0437\u0430\u043a\u0440\u044b\u0442";
+    t[143] = "Этот объект SQLXML уже был закрыт";
     t[146] = "Unexpected copydata from server for {0}";
-    t[147] = "\u041d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u044b\u0439 \u0441\u0442\u0430\u0442\u0443\u0441 \u043a\u043e\u043c\u0430\u043d\u0434\u044b COPY: {0}";
+    t[147] = "Неожиданный статус команды COPY: {0}";
     t[148] = "Connection has been closed.";
-    t[149] = "\u042d\u0442\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 \u0431\u044b\u043b\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u043e";
+    t[149] = "Это соединение уже было закрыто";
     t[150] = "Not implemented: 2nd phase commit must be issued using an idle connection. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
-    t[151] = "\u0414\u0443\u0445\u0444\u0430\u0437\u043d\u0430\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e, \u0435\u0441\u043b\u0438 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e (state=idle \u0438 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0446\u0438\u044f \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442). commit xid={0}, currentXid={1}, state={2], transactionState={3}";
+    t[151] = "Духфазная фиксация работает только, если соединение неактивно (state=idle и транзакцция отсутствует). commit xid={0}, currentXid={1}, state={2], transactionState={3}";
     t[160] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[161] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u0442\u044c SSLSocketFactory \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u043a\u043b\u0430\u0441\u0441\u0430 {0}";
+    t[161] = "Невозможно создать SSLSocketFactory с помощью указанного класса {0}";
     t[164] = "The SocketFactory class provided {0} could not be instantiated.";
-    t[165] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u0442\u044c SSLSocketFactory \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u043a\u043b\u0430\u0441\u0441\u0430 {0}";
+    t[165] = "Невозможно создать SSLSocketFactory с помощью указанного класса {0}";
     t[166] = "An I/O error occurred while sending to the backend.";
-    t[167] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u0432\u044b\u0432\u043e\u0434\u0430 \u043f\u0440\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0435 \u0431\u044d\u043a\u0435\u043d\u0434\u0443";
+    t[167] = "Ошибка ввода/ввывода при отправке бэкенду";
     t[184] = "An error occurred reading the certificate";
-    t[185] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0447\u0442\u0435\u043d\u0438\u0438 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430";
+    t[185] = "Ошибка при чтении сертификата";
     t[196] = "commit called before end. commit xid={0}, state={1}";
-    t[197] = "\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f commit \u0434\u043e\u043b\u0436\u043d\u0430 \u0432\u044b\u0437\u044b\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u043f\u043e\u0441\u043b\u0435 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438 end. commit xid={0}, state={1}";
+    t[197] = "Операция commit должна вызываться только после операции end. commit xid={0}, state={1}";
     t[200] = "Finalizing a Connection that was never closed:";
-    t[201] = "\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u00ab\u0443\u0442\u0435\u043a\u043b\u043e\u00bb. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435, \u0447\u0442\u043e \u0432 \u043a\u043e\u0434\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0432\u044b\u0437\u044b\u0432\u0430\u0435\u0442\u0441\u044f connection.close(). \u0414\u0430\u043b\u0435\u0435 \u0441\u043b\u0435\u0434\u0443\u0435\u0442 \u0441\u0442\u0435\u043a\u0442\u0440\u0435\u0439\u0441 \u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u0430, \u0433\u0434\u0435 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u043b\u043e\u0441\u044c \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u043d\u043e\u0435 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435";
+    t[201] = "Соединение «утекло». Проверьте, что в коде приложения вызывается connection.close(). Далее следует стектрейс того места, где создавалось проблемное соединение";
     t[202] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[203] = "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c UTF-8: \u0444\u0438\u043d\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f surrogate \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c: {0}";
+    t[203] = "Неверная последовательность UTF-8: финальное значение является surrogate значением: {0}";
     t[210] = "Unknown Response Type {0}.";
-    t[211] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0442\u0438\u043f \u043e\u0442\u0432\u0435\u0442\u0430 {0}.";
+    t[211] = "Неизвестный тип ответа {0}.";
     t[214] = "Expected an EOF from server, got: {0}";
-    t[215] = "\u041d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u044b\u0439 \u043e\u0442\u0432\u0435\u0442 \u043e\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430. \u041e\u0436\u0438\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u043a\u043e\u043d\u0447\u0430\u043d\u0438\u0435 \u043f\u043e\u0442\u043e\u043a\u0430, \u043f\u043e\u043b\u0443\u0447\u0435\u043d \u0431\u0430\u0439\u0442 {0}";
+    t[215] = "Неожиданный ответ от сервера. Ожидалось окончание потока, получен байт {0}";
     t[220] = "Invalid sslmode value: {0}";
-    t[221] = "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 sslmode: {0}";
+    t[221] = "Неверное значение sslmode: {0}";
     t[222] = "Failed to initialize LargeObject API";
-    t[223] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 LargeObject API";
+    t[223] = "Ошибка при инициализации LargeObject API";
     t[226] = "Connection attempt timed out.";
-    t[227] = "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u043b\u043e\u0441\u044c \u0432\u0440\u0435\u043c\u044f \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f";
+    t[227] = "Закончилось время ожидания";
     t[232] = "An unexpected result was returned by a query.";
-    t[233] = "\u0417\u0430\u043f\u0440\u043e\u0441 \u0432\u0435\u0440\u043d\u0443\u043b \u043d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u044b\u0439 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442.";
+    t[233] = "Запрос вернул неожиданный результат.";
     t[236] = "Error committing prepared transaction. commit xid={0}, preparedXid={1}, currentXid={2}";
-    t[237] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438 \u043f\u043e\u0434\u0433\u043e\u0442\u043e\u0432\u043b\u0435\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438. commit xid={0}, preparedXid={1}, currentXid={2}";
+    t[237] = "Ошибка при фиксации подготовленной транзакции. commit xid={0}, preparedXid={1}, currentXid={2}";
     t[242] = "Unknown type {0}.";
-    t[243] = "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0442\u0438\u043f {0}.";
+    t[243] = "Неизвестный тип {0}.";
     t[250] = "Interrupted while waiting to obtain lock on database connection";
-    t[251] = "\u041e\u0436\u0438\u0434\u0430\u043d\u0438\u0435 COPY \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0438 \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435\u043c interrupt";
+    t[251] = "Ожидание COPY блокировки прервано получением interrupt";
     t[262] = "Invalid targetServerType value: {0}";
-    t[263] = "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 targetServerType: {0}";
+    t[263] = "Неверное значение targetServerType: {0}";
     t[270] = "A result was returned when none was expected.";
-    t[271] = "\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0451\u043d \u043a\u043e\u0433\u0434\u0430 \u0435\u0433\u043e \u043d\u0435 \u043e\u0436\u0438\u0434\u0430\u043b\u043e\u0441\u044c.";
+    t[271] = "Результат возвращён когда его не ожидалось.";
     t[272] = "Detail: {0}";
-    t[273] = "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438: {0}";
+    t[273] = "Подробности: {0}";
     t[276] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[277] = "\u0418\u043d\u0434\u0435\u043a\u0441 \u043a\u043e\u043b\u043e\u043d\u043a\u0438 \u0432\u043d\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430: {0}. \u0414\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f: 1..{1}";
+    t[277] = "Индекс колонки вне диапазона: {0}. Допустимые значения: 1..{1}";
     t[284] = "This ResultSet is closed.";
-    t[285] = "ResultSet \u0437\u0430\u043a\u0440\u044b\u0442.";
+    t[285] = "ResultSet закрыт.";
     t[298] = "Requested CopyIn but got {0}";
-    t[299] = "\u041e\u0436\u0438\u0434\u0430\u043b\u0441\u044f \u043e\u0442\u0432\u0435\u0442 CopyIn, \u0430 \u043f\u043e\u043b\u0443\u0447\u0435\u043d {0}";
+    t[299] = "Ожидался ответ CopyIn, а получен {0}";
     t[302] = "Conversion to type {0} failed: {1}.";
-    t[303] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u043a \u0442\u0438\u043f\u0443 {0}: {1}";
+    t[303] = "Ошибка при преобразовании к типу {0}: {1}";
     t[306] = "Not implemented: Prepare must be issued using the same connection that started the transaction. currentXid={0}, prepare xid={1}";
-    t[307] = "\u0412 \u043a\u0430\u043a\u043e\u043c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0438 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u043d\u0430\u0447\u0438\u043d\u0430\u043b\u0438, \u0432 \u0442\u0430\u043a\u043e\u043c \u0438 \u0432\u044b\u0437\u044b\u0432\u0430\u0439\u0442\u0435 prepare. \u041f\u043e-\u0434\u0440\u0443\u0433\u043e\u043c\u0443 \u043d\u0435 \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442. currentXid={0}, prepare xid={1}";
+    t[307] = "В каком соединении транзакцию начинали, в таком и вызывайте prepare. По-другому не работает. currentXid={0}, prepare xid={1}";
     t[308] = "Server SQLState: {0}";
-    t[309] = "SQLState \u0441\u0435\u0440\u0432\u0435\u0440\u0430: {0}";
+    t[309] = "SQLState сервера: {0}";
     t[314] = "Connection to {0} refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.";
-    t[315] = "\u041f\u043e\u0434\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043f\u043e \u0430\u0434\u0440\u0435\u0441\u0443 {0} \u043e\u0442\u043a\u043b\u043e\u043d\u0435\u043d\u043e. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0447\u0442\u043e \u0445\u043e\u0441\u0442 \u0438 \u043f\u043e\u0440\u0442 \u0443\u043a\u0430\u0437\u0430\u043d\u044b \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e \u0438 \u0447\u0442\u043e postmaster \u043f\u0440\u0438\u043d\u0438\u043c\u0430\u0435\u0442 TCP/IP-\u043f\u043e\u0434\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f.";
+    t[315] = "Подсоединение по адресу {0} отклонено. Проверьте что хост и порт указаны правильно и что postmaster принимает TCP/IP-подсоединения.";
     t[318] = "Invalid flags {0}";
-    t[319] = "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0444\u043b\u0430\u0433\u0438 {0}";
+    t[319] = "Неверные флаги {0}";
     t[326] = "Statement has been closed.";
-    t[327] = "Statement \u0437\u0430\u043a\u0440\u044b\u0442.";
+    t[327] = "Statement закрыт.";
     t[328] = "Too many update results were returned.";
-    t[329] = "\u0412\u043e\u0437\u0432\u0440\u0430\u0449\u0435\u043d\u043e \u0441\u043b\u0438\u0448\u043a\u043e\u043c \u043c\u043d\u043e\u0433\u043e \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f.";
+    t[329] = "Возвращено слишком много результатов обновления.";
     t[330] = "The connection attempt failed.";
-    t[331] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u043f\u044b\u0442\u043a\u0435 \u043f\u043e\u0434\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f.";
+    t[331] = "Ошибка при попытке подсоединения.";
     t[342] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[343] = "\u041c\u0435\u0441\u0442\u043e\u043d\u0430\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0435: \u0424\u0430\u0439\u043b {0}, \u041f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u0430: {1}, \u0421\u0442\u0440\u043e\u043a\u0430: {2}";
+    t[343] = "Местонахождение: Файл {0}, Процедура: {1}, Строка: {2}";
     t[344] = "Expected command status BEGIN, got {0}.";
-    t[345] = "\u041e\u0436\u0438\u0434\u0430\u043b\u0441\u044f \u0441\u0442\u0430\u0442\u0443\u0441 \u043a\u043e\u043c\u0430\u043d\u0434\u044b BEGIN, \u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0435\u043d {0}";
+    t[345] = "Ожидался статус команды BEGIN, но получен {0}";
     t[346] = "There are no rows in this ResultSet.";
-    t[347] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443, \u0442.\u043a. \u0432 \u0442\u0435\u043a\u0443\u0449\u0435\u043c ResultSet\u2019\u0435 \u0441\u0442\u0440\u043e\u043a \u0432\u043e\u043e\u0431\u0449\u0435 \u043d\u0435\u0442";
+    t[347] = "Невозможно удалить строку, т.к. в текущем ResultSet’е строк вообще нет";
     t[350] = "Where: {0}";
-    t[351] = "\u0413\u0434\u0435: {0}";
+    t[351] = "Где: {0}";
     t[356] = "Failed to set ClientInfo property: {0}";
-    t[357] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e ClientInfo: {0}";
+    t[357] = "Невозможно установить свойство ClientInfo: {0}";
     t[358] = "Conversion of money failed.";
-    t[359] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u0442\u0438\u043f\u0430 money.";
+    t[359] = "Ошибка при преобразовании типа money.";
     t[366] = "Error preparing transaction. prepare xid={0}";
-    t[367] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0438 prepare \u0434\u043b\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 {0}";
+    t[367] = "Ошибка при выполнении prepare для транзакции {0}";
     t[368] = "Invalid timeout ({0}<0).";
-    t[369] = "\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0442\u0430\u0439\u043c\u0430\u0443\u0442\u0430 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043d\u0435\u043e\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u043c: {0}";
+    t[369] = "Значение таймаута должно быть неотрицательным: {0}";
     t[374] = "Unsupported value for stringtype parameter: {0}";
-    t[375] = "\u041d\u0435\u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 stringtype: {0}";
+    t[375] = "Неподдерживаемое значение для параметра stringtype: {0}";
     t[380] = "Requested CopyOut but got {0}";
-    t[381] = "\u041e\u0436\u0438\u0434\u0430\u043b\u0441\u044f \u043e\u0442\u0432\u0435\u0442 CopyOut, \u0430 \u043f\u043e\u043b\u0443\u0447\u0435\u043d {0}";
+    t[381] = "Ожидался ответ CopyOut, а получен {0}";
     t[382] = "This PooledConnection has already been closed.";
-    t[383] = "\u042d\u0442\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 \u0431\u044b\u043b\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u043e";
+    t[383] = "Это соединение уже было закрыто";
     t[392] = "Could not find a server with specified targetServerType: {0}";
-    t[393] = "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440 \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c targetServerType: {0}";
+    t[393] = "Не удалось найти сервер с указанным значением targetServerType: {0}";
     t[402] = "Interrupted while attempting to connect.";
-    t[403] = "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0430\u0435\u043d\u0438\u0435\u043c interrupt";
+    t[403] = "Подключение прервано получаением interrupt";
     t[406] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[407] = "\u0418\u043d\u0434\u0435\u043a\u0441 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 \u0432\u043d\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430: {0}. \u0414\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f: 1..{1}";
+    t[407] = "Индекс параметра вне диапазона: {0}. Допустимые значения: 1..{1}";
     t[410] = "Unable to bind parameter values for statement.";
-    t[411] = "\u041d\u0435 \u0432 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438 \u0430\u0441\u0441\u043e\u0446\u0438\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0434\u043b\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u044b (PGBindException)";
+    t[411] = "Не в состоянии ассоциировать значения параметров для команды (PGBindException)";
     t[420] = "Cannot write to copy a byte of value {0}";
-    t[421] = "\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 byte \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0432 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0435 0..255, \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435: {0}";
+    t[421] = "Значение byte должно быть в диапазоне 0..255, переданное значение: {0}";
     t[422] = "Ran out of memory retrieving query results.";
-    t[423] = "\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0430\u043c\u044f\u0442\u0438 \u0434\u043b\u044f \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u0437\u0430\u043f\u0440\u043e\u0441\u0430. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0443\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c -Xmx \u0438\u043b\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0440\u0430\u0437\u043c\u0435\u0440\u044b \u043e\u0431\u0440\u0430\u0431\u0430\u0442\u044b\u0432\u0430\u0435\u043c\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445";
+    t[423] = "Недостаточно памяти для обработки результатов запроса. Попробуйте увеличить -Xmx или проверьте размеры обрабатываемых данных";
     t[434] = "Prepare called before end. prepare xid={0}, state={1}";
-    t[435] = "\u0412\u044b\u0437\u043e\u0432 prepare \u0434\u043e\u043b\u0436\u0435\u043d \u043f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043f\u043e\u0441\u043b\u0435 \u0432\u044b\u0437\u043e\u0432\u0430 end. prepare xid={0}, state={1}";
+    t[435] = "Вызов prepare должен происходить только после вызова end. prepare xid={0}, state={1}";
     t[436] = "Hint: {0}";
-    t[437] = "\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430: {0}";
+    t[437] = "Подсказка: {0}";
     t[444] = "This copy stream is closed.";
-    t[445] = "\u041f\u043e\u0442\u043e\u043a \u0443\u0436\u0435 \u0431\u044b\u043b \u0437\u0430\u043a\u0440\u044b\u0442";
+    t[445] = "Поток уже был закрыт";
     t[450] = "The server does not support SSL.";
-    t[451] = "\u0421\u0435\u0440\u0432\u0435\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 SSL.";
+    t[451] = "Сервер не поддерживает SSL.";
     t[454] = "Conversion of interval failed";
-    t[455] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c PGInterval: {0}";
+    t[455] = "Невозможно обработать PGInterval: {0}";
     t[464] = "No value specified for parameter {0}.";
-    t[465] = "\u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 {0}.";
+    t[465] = "Не указано значение для параметра {0}.";
     t[466] = "Invalid stream length {0}.";
-    t[467] = "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0434\u043b\u0438\u043d\u0430 \u043f\u043e\u0442\u043e\u043a\u0430 {0}.";
+    t[467] = "Неверная длина потока {0}.";
     t[472] = "Unsupported properties: {0}";
-    t[473] = "\u0423\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0442\u0441\u044f: {0}";
+    t[473] = "Указанные свойства не поддерживаются: {0}";
     t[474] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[475] = "\u041d\u0430\u0439\u0434\u0435\u043d\u044b \u043d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044c\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.  \u041f\u0440\u0438\u0447\u0438\u043d\u043e\u0439 \u044d\u0442\u043e\u0433\u043e \u0441\u043a\u043e\u0440\u0435\u0435 \u0432\u0441\u0435\u0433\u043e \u044f\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0445\u0440\u0430\u043d\u0438\u043c\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0438\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b \u043d\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u043d\u0430\u0431\u043e\u0440\u0443 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432 \u0431\u0430\u0437\u044b.  \u0422\u0438\u043f\u0438\u0447\u043d\u044b\u043c \u043f\u0440\u0438\u043c\u0435\u0440\u043e\u043c \u044d\u0442\u043e\u0433\u043e \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435 8-\u0431\u0438\u0442\u043d\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445 \u0432 \u0431\u0430\u0437\u0435 SQL_ASCII.";
+    t[475] = "Найдены неверные символьные данные.  Причиной этого скорее всего являются хранимые данные содержащие символы не соответствующие набору символов базы.  Типичным примером этого является хранение 8-битных данных в базе SQL_ASCII.";
     t[476] = "Copying from database failed: {0}";
-    t[477] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0435 \u043e\u0442\u0432\u0435\u0442\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u044b COPY: {0}";
+    t[477] = "Ошибка при обработке ответа команды COPY: {0}";
     t[480] = "This statement has been closed.";
-    t[481] = "\u042d\u0442\u043e\u0442 Sstatement \u0431\u044b\u043b \u0437\u0430\u043a\u0440\u044b\u0442.";
+    t[481] = "Этот Sstatement был закрыт.";
     t[484] = "oid type {0} not known and not a number";
-    t[485] = "Oid {0} \u043d\u0435 \u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043d \u0438\u043b\u0438 \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0447\u0438\u0441\u043b\u043e\u043c";
+    t[485] = "Oid {0} не известен или не является числом";
     t[490] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[491] = "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c UTF-8: \u0431\u0430\u0439\u0442 {0} \u0438\u0437 {1} \u043d\u0435 \u043f\u043e\u0434\u0445\u043e\u0434\u0438\u0442 \u043a \u043c\u0430\u0441\u043a\u0435 10xxxxxx: {2}";
+    t[491] = "Неверная последовательность UTF-8: байт {0} из {1} не подходит к маске 10xxxxxx: {2}";
     t[494] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
-    t[495] = "\u0427\u0435\u0440\u0435\u0434\u043e\u0432\u0430\u043d\u0438\u0435 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0439 \u0432 \u043e\u0434\u043d\u043e\u043c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0438 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. \u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0443\u044e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u043d\u0443\u0436\u043d\u043e \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c xid={0}, currentXid={1}, state={2}, flags={3}";
+    t[495] = "Чередование транзакций в одном соединении не поддерживается. Предыдущую транзакцию нужно завершить xid={0}, currentXid={1}, state={2}, flags={3}";
     t[506] = "Method {0} is not yet implemented.";
-    t[507] = "\u041c\u0435\u0442\u043e\u0434 {0} \u0435\u0449\u0451 \u043d\u0435 \u0440\u0435\u0430\u043b\u0438\u0437\u043e\u0432\u0430\u043d";
+    t[507] = "Метод {0} ещё не реализован";
     t[514] = "DataSource has been closed.";
-    t[515] = "DataSource \u0437\u0430\u043a\u0440\u044b\u0442.";
+    t[515] = "DataSource закрыт.";
     t[518] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[519] = "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c UTF-8: \u0444\u0438\u043d\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0432\u043d\u0435 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0445: {0}";
+    t[519] = "Неверная последовательность UTF-8: финальное значение вне области допустимых: {0}";
     t[520] = "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, currentXid={2}";
-    t[521] = "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043e\u0442\u043a\u0430\u0442\u0435 \u043f\u043e\u0434\u0433\u043e\u0442\u043e\u0432\u043b\u0435\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438. rollback xid={0}, preparedXid={1}, currentXid={2}";
+    t[521] = "Ошибка при откате подготовленной транзакции. rollback xid={0}, preparedXid={1}, currentXid={2}";
     t[522] = "Unable to create SAXResult for SQLXML.";
-    t[523] = "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u0442\u044c SAXResult \u0434\u043b\u044f SQLXML";
+    t[523] = "Невозможно создать SAXResult для SQLXML";
     t[530] = "This connection has been closed.";
-    t[531] = "\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 \u0431\u044b\u043b\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u043e";
+    t[531] = "Соединение уже было закрыто";
     t[538] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[539] = "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c UTF-8: \u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u0438\u0435 {0}: {1}";
+    t[539] = "Неверная последовательность UTF-8: начальное значеие {0}: {1}";
     t[544] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[545] = "\u0420\u0430\u043d\u043d\u0435\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u0435 \u0432\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u043f\u043e\u0442\u043e\u043a\u0430, \u043e\u0436\u0438\u0434\u0430\u043b\u043e\u0441\u044c \u0431\u0430\u0439\u0442: {0}, \u043d\u043e \u0441\u0447\u0438\u0442\u0430\u043d\u043e \u0442\u043e\u043b\u044c\u043a\u043e {1}";
+    t[545] = "Раннее завершение входного потока, ожидалось байт: {0}, но считано только {1}";
     t[550] = "Unsupported binary encoding of {0}.";
-    t[551] = "\u0411\u0438\u043d\u0430\u0440\u043d\u0430\u044f \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u0442\u0438\u043f\u0430  {0}";
+    t[551] = "Бинарная передача не поддерживается для типа  {0}";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_sr.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_sr.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_sr.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_sr.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,305 +5,305 @@
   static {
     java.lang.String[] t = new java.lang.String[794];
     t[0] = "";
-    t[1] = "Project-Id-Version: PostgreSQL 8.1\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2009-05-26 11:13+0100\nLast-Translator: Bojan \u0160kaljac <skaljac (at) gmail.com>\nLanguage-Team: Srpski <skaljac@gmail.com>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Serbian\nX-Poedit-Country: YUGOSLAVIA\n";
+    t[1] = "Project-Id-Version: PostgreSQL 8.1\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2009-05-26 11:13+0100\nLast-Translator: Bojan Škaljac <skaljac (at) gmail.com>\nLanguage-Team: Srpski <skaljac@gmail.com>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Serbian\nX-Poedit-Country: YUGOSLAVIA\n";
     t[4] = "DataSource has been closed.";
     t[5] = "DataSource je zatvoren.";
     t[8] = "Invalid flags {0}";
-    t[9] = "Neva\u017ee\u0107e zastavice {0}";
+    t[9] = "Nevažeće zastavice {0}";
     t[18] = "Where: {0}";
     t[19] = "Gde: {0}";
     t[24] = "Unknown XML Source class: {0}";
     t[25] = "Nepoznata XML ulazna klasa: {0}";
     t[26] = "The connection attempt failed.";
-    t[27] = "Poku\u0161aj konektovanja propao.";
+    t[27] = "Pokušaj konektovanja propao.";
     t[28] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[29] = "Trenutna pozicija posle kraja ResultSet-a.  Ne mo\u017eete pozvati deleteRow() na toj poziciji.";
+    t[29] = "Trenutna pozicija posle kraja ResultSet-a.  Ne možete pozvati deleteRow() na toj poziciji.";
     t[32] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[33] = "Ne mo\u017eete da koristite metode za upit koji uzimaju string iz upita u PreparedStatement-u.";
+    t[33] = "Ne možete da koristite metode za upit koji uzimaju string iz upita u PreparedStatement-u.";
     t[36] = "Multiple ResultSets were returned by the query.";
-    t[37] = "Vi\u0161estruki ResultSet-vi su vra\u0107eni od strane upita.";
+    t[37] = "Višestruki ResultSet-vi su vraćeni od strane upita.";
     t[50] = "Too many update results were returned.";
-    t[51] = "Previ\u0161e rezultata za a\u017euriranje je vra\u0107eno.";
+    t[51] = "Previše rezultata za ažuriranje je vraćeno.";
     t[58] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
     t[59] = "Ilegalna UTF-8 sekvenca: inicijalni bajt je {0}: {1}";
     t[66] = "The column name {0} was not found in this ResultSet.";
     t[67] = "Ime kolone {0} nije pronadjeno u ResultSet.";
     t[70] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[71] = "Fastpath poziv {0} - Nikakav rezultat nije vra\u0107en a o\u010dekivan je integer.";
+    t[71] = "Fastpath poziv {0} - Nikakav rezultat nije vraćen a očekivan je integer.";
     t[74] = "Protocol error.  Session setup failed.";
-    t[75] = "Gre\u0161ka protokola.  Zakazivanje sesije propalo.";
+    t[75] = "Greška protokola.  Zakazivanje sesije propalo.";
     t[76] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
     t[77] = "CallableStatement jedeklarisan ali nije bilo poziva registerOutParameter (1, <neki_tip>).";
     t[78] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[79] = "ResultSets sa osobinom CONCUR_READ_ONLY ne moe\u017ee biti a\u017euriran.";
+    t[79] = "ResultSets sa osobinom CONCUR_READ_ONLY ne moeže biti ažuriran.";
     t[90] = "LOB positioning offsets start at 1.";
-    t[91] = "LOB pozicija ofset po\u010dinje kod 1.";
+    t[91] = "LOB pozicija ofset počinje kod 1.";
     t[92] = "Internal Position: {0}";
     t[93] = "Interna pozicija: {0}";
     t[96] = "free() was called on this LOB previously";
     t[97] = "free() je pozvan na ovom LOB-u prethodno";
     t[100] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[101] = "Nije mogu\u0107e izmeniti read-only osobinu transakcije u sred izvr\u0161avanja transakcije.";
+    t[101] = "Nije moguće izmeniti read-only osobinu transakcije u sred izvršavanja transakcije.";
     t[102] = "The JVM claims not to support the {0} encoding.";
-    t[103] = "JVM tvrdi da ne podr\u017eava {0} encoding.";
+    t[103] = "JVM tvrdi da ne podržava {0} encoding.";
     t[108] = "{0} function doesn''t take any argument.";
     t[109] = "Funkcija {0} nema parametara.";
     t[112] = "xid must not be null";
     t[113] = "xid ne sme biti null";
     t[114] = "Connection has been closed.";
-    t[115] = "Konekcija je ve\u0107 zatvorena.";
+    t[115] = "Konekcija je već zatvorena.";
     t[122] = "The server does not support SSL.";
-    t[123] = "Server ne podr\u017eava SSL.";
+    t[123] = "Server ne podržava SSL.";
     t[124] = "Custom type maps are not supported.";
-    t[125] = "Mape sa korisni\u010dki definisanim tipovima nisu podr\u017eane.";
+    t[125] = "Mape sa korisnički definisanim tipovima nisu podržane.";
     t[140] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
     t[141] = "Ilegalna UTF-8 sekvenca: bajt {0} od {1} bajtova sekvence nije 10xxxxxx: {2}";
     t[148] = "Hint: {0}";
     t[149] = "Nagovest: {0}";
     t[152] = "Unable to find name datatype in the system catalogs.";
-    t[153] = "Nije mogu\u0107e prona\u0107i ime tipa podatka u sistemskom katalogu.";
+    t[153] = "Nije moguće pronaći ime tipa podatka u sistemskom katalogu.";
     t[156] = "Unsupported Types value: {0}";
-    t[157] = "Za tip nije podr\u017eana vrednost: {0}";
+    t[157] = "Za tip nije podržana vrednost: {0}";
     t[158] = "Unknown type {0}.";
     t[159] = "Nepoznat tip {0}.";
     t[166] = "{0} function takes two and only two arguments.";
     t[167] = "Funkcija {0} prima dva i samo dva parametra.";
     t[170] = "Finalizing a Connection that was never closed:";
-    t[171] = "Dovr\u0161avanje konekcije koja nikada nije zatvorena:";
+    t[171] = "Dovršavanje konekcije koja nikada nije zatvorena:";
     t[180] = "The maximum field size must be a value greater than or equal to 0.";
-    t[181] = "Maksimalna vrednost veli\u010dine polja mora biti vrednost ve\u0107a ili jednaka 0.";
+    t[181] = "Maksimalna vrednost veličine polja mora biti vrednost veća ili jednaka 0.";
     t[186] = "PostgreSQL LOBs can only index to: {0}";
-    t[187] = "PostgreSQL LOB mogu jedino da ozna\u010davaju: {0}";
+    t[187] = "PostgreSQL LOB mogu jedino da označavaju: {0}";
     t[194] = "Method {0} is not yet implemented.";
-    t[195] = "Metod {0} nije jo\u0161 impelemtiran.";
+    t[195] = "Metod {0} nije još impelemtiran.";
     t[198] = "Error loading default settings from driverconfig.properties";
-    t[199] = "Gre\u0161ka u \u010ditanju standardnih pode\u0161avanja iz driverconfig.properties";
+    t[199] = "Greška u čitanju standardnih podešavanja iz driverconfig.properties";
     t[200] = "Results cannot be retrieved from a CallableStatement before it is executed.";
-    t[201] = "Razultat nemo\u017ee da se primi iz CallableStatement pre nego \u0161to se on izvr\u0161i.";
+    t[201] = "Razultat nemože da se primi iz CallableStatement pre nego što se on izvrši.";
     t[202] = "Large Objects may not be used in auto-commit mode.";
     t[203] = "Veliki objekti (Large Object) se nemogu koristiti u auto-commit modu.";
     t[208] = "Expected command status BEGIN, got {0}.";
-    t[209] = "O\u010dekivan status komande je BEGIN, a dobijeno je {0}.";
+    t[209] = "Očekivan status komande je BEGIN, a dobijeno je {0}.";
     t[218] = "Invalid fetch direction constant: {0}.";
-    t[219] = "Pogre\u0161na konstanta za direkciju dono\u0161enja: {0}.";
+    t[219] = "Pogrešna konstanta za direkciju donošenja: {0}.";
     t[222] = "{0} function takes three and only three arguments.";
     t[223] = "Funkcija {0} prima tri i samo tri parametra.";
     t[226] = "This SQLXML object has already been freed.";
-    t[227] = "Ovaj SQLXML je ve\u0107 obrisan.";
+    t[227] = "Ovaj SQLXML je već obrisan.";
     t[228] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[229] = "Nije mogu\u0107e a\u017eurirati ResultSet zato \u0161to je ili po\u010detak ili kraj rezultata.";
+    t[229] = "Nije moguće ažurirati ResultSet zato što je ili početak ili kraj rezultata.";
     t[230] = "The JVM claims not to support the encoding: {0}";
-    t[231] = "JVM tvrdi da ne podr\u017eava encoding: {0}";
+    t[231] = "JVM tvrdi da ne podržava encoding: {0}";
     t[232] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[233] = "Parametar tipa {0} je registrovan,ali poziv za get{1} (sql tip={2}) je izvr\u0161en.";
+    t[233] = "Parametar tipa {0} je registrovan,ali poziv za get{1} (sql tip={2}) je izvršen.";
     t[234] = "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, currentXid={2}";
-    t[235] = "Gre\u0161ka prilikom povratka na prethodo pripremljenu transakciju. rollback xid={0}, preparedXid={1}, currentXid={2}";
+    t[235] = "Greška prilikom povratka na prethodo pripremljenu transakciju. rollback xid={0}, preparedXid={1}, currentXid={2}";
     t[240] = "Cannot establish a savepoint in auto-commit mode.";
-    t[241] = "U auto-commit modu nije mogu\u0107e pode\u0161avanje ta\u010dki snimanja.";
+    t[241] = "U auto-commit modu nije moguće podešavanje tački snimanja.";
     t[242] = "Cannot retrieve the id of a named savepoint.";
-    t[243] = "Nije mogu\u0107e primiti id imena ta\u010dke snimanja.";
+    t[243] = "Nije moguće primiti id imena tačke snimanja.";
     t[244] = "The column index is out of range: {0}, number of columns: {1}.";
     t[245] = "Indeks kolone van osega: {0}, broj kolona: {1}.";
     t[250] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[251] = "Ne\u0161to neobi\u010dno se dogodilo i drajver je zakazao. Molim prijavite ovaj izuzetak.";
+    t[251] = "Nešto neobično se dogodilo i drajver je zakazao. Molim prijavite ovaj izuzetak.";
     t[260] = "Cannot cast an instance of {0} to type {1}";
-    t[261] = "Nije mogu\u0107e kastovati instancu {0} u tip {1}";
+    t[261] = "Nije moguće kastovati instancu {0} u tip {1}";
     t[264] = "Unknown Types value.";
     t[265] = "Nepoznata vrednost za Types.";
     t[266] = "Invalid stream length {0}.";
-    t[267] = "Neva\u017ee\u0107a du\u017eina toka {0}.";
+    t[267] = "Nevažeća dužina toka {0}.";
     t[272] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[273] = "Nije mogu\u0107e izvaditi ime ta\u010dke snimanja koja nema ime.";
+    t[273] = "Nije moguće izvaditi ime tačke snimanja koja nema ime.";
     t[274] = "Unable to translate data into the desired encoding.";
-    t[275] = "Nije mogu\u0107e prevesti podatke u odabrani encoding format.";
+    t[275] = "Nije moguće prevesti podatke u odabrani encoding format.";
     t[276] = "Expected an EOF from server, got: {0}";
-    t[277] = "O\u010dekivan EOF od servera, a dobijeno: {0}";
+    t[277] = "Očekivan EOF od servera, a dobijeno: {0}";
     t[278] = "Bad value for type {0} : {1}";
-    t[279] = "Pogre\u0161na vrednost za tip {0} : {1}";
+    t[279] = "Pogrešna vrednost za tip {0} : {1}";
     t[280] = "The server requested password-based authentication, but no password was provided.";
-    t[281] = "Server zahteva autentifikaciju baziranu na \u0161ifri, ali \u0161ifra nije prosle\u0111ena.";
+    t[281] = "Server zahteva autentifikaciju baziranu na šifri, ali šifra nije prosleđena.";
     t[286] = "Unable to create SAXResult for SQLXML.";
-    t[287] = "Nije mogu\u0107e kreirati SAXResult za SQLXML.";
+    t[287] = "Nije moguće kreirati SAXResult za SQLXML.";
     t[292] = "Error during recover";
-    t[293] = "Gre\u0161ka prilikom oporavljanja.";
+    t[293] = "Greška prilikom oporavljanja.";
     t[294] = "tried to call end without corresponding start call. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
-    t[295] = "Poku\u0161aj pozivanja kraja pre odgovaraju\u0107eg po\u010detka. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
+    t[295] = "Pokušaj pozivanja kraja pre odgovarajućeg početka. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
     t[296] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[297] = "Skra\u0107ivanje velikih objekata je implementirano samo u 8.3 i novijim serverima.";
+    t[297] = "Skraćivanje velikih objekata je implementirano samo u 8.3 i novijim serverima.";
     t[298] = "This PooledConnection has already been closed.";
-    t[299] = "PooledConnection je ve\u0107 zatvoren.";
+    t[299] = "PooledConnection je već zatvoren.";
     t[302] = "ClientInfo property not supported.";
-    t[303] = "ClientInfo property nije podr\u017ean.";
+    t[303] = "ClientInfo property nije podržan.";
     t[306] = "Fetch size must be a value greater to or equal to 0.";
-    t[307] = "Doneta veli\u010dina mora biti vrednost ve\u0107a ili jednaka 0.";
+    t[307] = "Doneta veličina mora biti vrednost veća ili jednaka 0.";
     t[312] = "A connection could not be made using the requested protocol {0}.";
-    t[313] = "Konekciju nije mogu\u0107e kreirati uz pomo\u0107 protokola {0}.";
+    t[313] = "Konekciju nije moguće kreirati uz pomoć protokola {0}.";
     t[318] = "Unknown XML Result class: {0}";
     t[319] = "nepoznata XML klasa rezultata: {0}";
     t[322] = "There are no rows in this ResultSet.";
     t[323] = "U ResultSet-u nema redova.";
     t[324] = "Unexpected command status: {0}.";
-    t[325] = "Neo\u010dekivan komandni status: {0}.";
+    t[325] = "Neočekivan komandni status: {0}.";
     t[330] = "Heuristic commit/rollback not supported. forget xid={0}";
-    t[331] = "Heuristi\u010dki commit/rollback nije podr\u017ean. forget xid={0}";
+    t[331] = "Heuristički commit/rollback nije podržan. forget xid={0}";
     t[334] = "Not on the insert row.";
     t[335] = "Nije mod ubacivanja redova.";
     t[336] = "This SQLXML object has already been initialized, so you cannot manipulate it further.";
-    t[337] = "SQLXML objekat je ve\u0107 inicijalizovan, tako da ga nije mogu\u0107e dodatno menjati.";
+    t[337] = "SQLXML objekat je već inicijalizovan, tako da ga nije moguće dodatno menjati.";
     t[344] = "Server SQLState: {0}";
     t[345] = "SQLState servera: {0}";
     t[348] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
     t[349] = "Serverov standard_conforming_strings parametar javlja {0}. JDBC drajver ocekuje on ili off.";
     t[360] = "The driver currently does not support COPY operations.";
-    t[361] = "Drajver trenutno ne podr\u017eava COPY operacije.";
+    t[361] = "Drajver trenutno ne podržava COPY operacije.";
     t[364] = "The array index is out of range: {0}, number of elements: {1}.";
     t[365] = "Indeks niza je van opsega: {0}, broj elemenata: {1}.";
     t[374] = "suspend/resume not implemented";
     t[375] = "obustavljanje/nastavljanje nije implementirano.";
     t[378] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
-    t[379] = "Nije implementirano: Commit iz jedne faze mora biti izdat uz kori\u0161tenje iste konekcije koja je kori\u0161tena za startovanje.";
+    t[379] = "Nije implementirano: Commit iz jedne faze mora biti izdat uz korištenje iste konekcije koja je korištena za startovanje.";
     t[380] = "Error during one-phase commit. commit xid={0}";
-    t[381] = "Kre\u0161ka prilikom commit-a iz jedne faze. commit xid={0}";
+    t[381] = "Kreška prilikom commit-a iz jedne faze. commit xid={0}";
     t[398] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[399] = "Nije mogu\u0107e pozvati cancelRowUpdates() prilikom ubacivanja redova.";
+    t[399] = "Nije moguće pozvati cancelRowUpdates() prilikom ubacivanja redova.";
     t[400] = "Cannot reference a savepoint after it has been released.";
-    t[401] = "Nije mogu\u0107e referenciranje ta\u010dke snimanja nakon njenog osloba\u0111anja.";
+    t[401] = "Nije moguće referenciranje tačke snimanja nakon njenog oslobađanja.";
     t[402] = "You must specify at least one column value to insert a row.";
     t[403] = "Morate specificirati barem jednu vrednost za kolonu da bi ste ubacili red.";
     t[404] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[405] = "Nije mogu\u0107e odrediti vrednost za MaxIndexKezs zbog nedostatka podataka u sistemskom katalogu.";
+    t[405] = "Nije moguće odrediti vrednost za MaxIndexKezs zbog nedostatka podataka u sistemskom katalogu.";
     t[412] = "Illegal UTF-8 sequence: final value is out of range: {0}";
     t[413] = "Ilegalna UTF-8 sekvenca: finalna vrednost je van opsega: {0}";
     t[414] = "{0} function takes two or three arguments.";
     t[415] = "Funkcija {0} prima dva ili tri parametra.";
     t[428] = "Unable to convert DOMResult SQLXML data to a string.";
-    t[429] = "Nije mogu\u0107e konvertovati DOMResult SQLXML podatke u string.";
+    t[429] = "Nije moguće konvertovati DOMResult SQLXML podatke u string.";
     t[434] = "Unable to decode xml data.";
-    t[435] = "Neuspe\u0161no dekodiranje XML podataka.";
+    t[435] = "Neuspešno dekodiranje XML podataka.";
     t[440] = "Unexpected error writing large object to database.";
-    t[441] = "Neo\u010dekivana gre\u0161ka prilikom upisa velikog objekta u bazu podataka.";
+    t[441] = "Neočekivana greška prilikom upisa velikog objekta u bazu podataka.";
     t[442] = "Zero bytes may not occur in string parameters.";
     t[443] = "Nula bajtovji se ne smeju pojavljivati u string parametrima.";
     t[444] = "A result was returned when none was expected.";
-    t[445] = "Rezultat vra\u0107en ali nikakav rezultat nije o\u010dekivan.";
+    t[445] = "Rezultat vraćen ali nikakav rezultat nije očekivan.";
     t[446] = "Not implemented: 2nd phase commit must be issued using an idle connection. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
-    t[447] = "Nije implementirano: Dvofazni commit mora biti izdat uz kori\u0161tenje besposlene konekcije. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
+    t[447] = "Nije implementirano: Dvofazni commit mora biti izdat uz korištenje besposlene konekcije. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
     t[450] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[451] = "ResultSet nije mogu\u0107e a\u017eurirati. Upit koji je generisao ovaj razultat mora selektoati jedino tabelu,i mora selektovati sve primrne klju\u010deve iz te tabele. Pogledajte API specifikaciju za JDBC 2.1, sekciju 5.6 za vi\u0161e detalja.";
+    t[451] = "ResultSet nije moguće ažurirati. Upit koji je generisao ovaj razultat mora selektoati jedino tabelu,i mora selektovati sve primrne ključeve iz te tabele. Pogledajte API specifikaciju za JDBC 2.1, sekciju 5.6 za više detalja.";
     t[454] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[455] = "Du\u017eina vezivne poruke {0} prevelika.  Ovo je mo\u017eda rezultat veoma velike ili pogre\u0161ne du\u017eine specifikacije za InputStream parametre.";
+    t[455] = "Dužina vezivne poruke {0} prevelika.  Ovo je možda rezultat veoma velike ili pogrešne dužine specifikacije za InputStream parametre.";
     t[460] = "Statement has been closed.";
-    t[461] = "Statemen je ve\u0107 zatvoren.";
+    t[461] = "Statemen je već zatvoren.";
     t[462] = "No value specified for parameter {0}.";
     t[463] = "Nije zadata vrednost za parametar {0}.";
     t[468] = "The array index is out of range: {0}";
     t[469] = "Indeks niza je van opsega: {0}";
     t[474] = "Unable to bind parameter values for statement.";
-    t[475] = "Nije mogu\u0107e na\u0107i vrednost vezivnog parametra za izjavu (statement).";
+    t[475] = "Nije moguće naći vrednost vezivnog parametra za izjavu (statement).";
     t[476] = "Can''t refresh the insert row.";
-    t[477] = "Nije mogu\u0107e osve\u017eiti uba\u010deni red.";
+    t[477] = "Nije moguće osvežiti ubačeni red.";
     t[480] = "No primary key found for table {0}.";
-    t[481] = "Nije prona\u0111en klju\u010d za tabelu {0}.";
+    t[481] = "Nije pronađen ključ za tabelu {0}.";
     t[482] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[483] = "Nije mogu\u0107e izmeniti nivo izolacije transakcije u sred izvr\u0161avanja transakcije.";
+    t[483] = "Nije moguće izmeniti nivo izolacije transakcije u sred izvršavanja transakcije.";
     t[498] = "Provided InputStream failed.";
     t[499] = "Pribaljeni InputStream zakazao.";
     t[500] = "The parameter index is out of range: {0}, number of parameters: {1}.";
     t[501] = "Index parametra je van opsega: {0}, broj parametara je: {1}.";
     t[502] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[503] = "Serverov DataStyle parametar promenjen u {0}. JDBC zahteva da DateStyle po\u010dinje sa ISO za uspe\u0161no zavr\u0161avanje operacije.";
+    t[503] = "Serverov DataStyle parametar promenjen u {0}. JDBC zahteva da DateStyle počinje sa ISO za uspešno završavanje operacije.";
     t[508] = "Connection attempt timed out.";
-    t[509] = "Isteklo je vreme za poku\u0161aj konektovanja.";
+    t[509] = "Isteklo je vreme za pokušaj konektovanja.";
     t[512] = "Internal Query: {0}";
     t[513] = "Interni upit: {0}";
     t[514] = "Error preparing transaction. prepare xid={0}";
-    t[515] = "Gre\u0161ka u pripremanju transakcije. prepare xid={0}";
+    t[515] = "Greška u pripremanju transakcije. prepare xid={0}";
     t[518] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[519] = "Tip autentifikacije {0} nije podr\u017ean. Proverite dali imate pode\u0161en pg_hba.conf fajl koji uklju\u010duje klijentovu IP adresu ili podmre\u017eu, i da ta mre\u017ea koristi \u0161emu autentifikacije koja je podr\u017eana od strane ovog drajvera.";
+    t[519] = "Tip autentifikacije {0} nije podržan. Proverite dali imate podešen pg_hba.conf fajl koji uključuje klijentovu IP adresu ili podmrežu, i da ta mreža koristi šemu autentifikacije koja je podržana od strane ovog drajvera.";
     t[526] = "Interval {0} not yet implemented";
-    t[527] = "Interval {0} jo\u0161 nije implementiran.";
+    t[527] = "Interval {0} još nije implementiran.";
     t[532] = "Conversion of interval failed";
     t[533] = "Konverzija intervala propala.";
     t[540] = "Query timeout must be a value greater than or equals to 0.";
-    t[541] = "Tajm-aut mora biti vrednost ve\u0107a ili jednaka 0.";
+    t[541] = "Tajm-aut mora biti vrednost veća ili jednaka 0.";
     t[542] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[543] = "Konekcija je zatvorena automatski zato \u0161to je nova konekcija otvorena za isti PooledConnection ili je PooledConnection zatvoren.";
+    t[543] = "Konekcija je zatvorena automatski zato što je nova konekcija otvorena za isti PooledConnection ili je PooledConnection zatvoren.";
     t[544] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[545] = "ResultSet nije pravilno pozicioniran, mo\u017eda je potrebno da pozovete next.";
+    t[545] = "ResultSet nije pravilno pozicioniran, možda je potrebno da pozovete next.";
     t[546] = "Prepare called before end. prepare xid={0}, state={1}";
     t[547] = "Pripremanje poziva pre kraja. prepare xid={0}, state={1}";
     t[548] = "Invalid UUID data.";
-    t[549] = "Neva\u017ee\u0107a UUID podatak.";
+    t[549] = "Nevažeća UUID podatak.";
     t[550] = "This statement has been closed.";
     t[551] = "Statement je zatvoren.";
     t[552] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[553] = "Nije mogu\u0107e zaklju\u010diti SQL tip koji bi se koristio sa instancom {0}. Koristite setObject() sa zadatim eksplicitnim tipom vrednosti.";
+    t[553] = "Nije moguće zaključiti SQL tip koji bi se koristio sa instancom {0}. Koristite setObject() sa zadatim eksplicitnim tipom vrednosti.";
     t[554] = "Cannot call updateRow() when on the insert row.";
-    t[555] = "Nije mogu\u0107e pozvati updateRow() prilikom ubacivanja redova.";
+    t[555] = "Nije moguće pozvati updateRow() prilikom ubacivanja redova.";
     t[562] = "Detail: {0}";
     t[563] = "Detalji: {0}";
     t[566] = "Cannot call deleteRow() when on the insert row.";
-    t[567] = "Nije mogu\u0107e pozvati deleteRow() prilikom ubacivanja redova.";
+    t[567] = "Nije moguće pozvati deleteRow() prilikom ubacivanja redova.";
     t[568] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[569] = "Trenutna pozicija pre po\u010detka ResultSet-a.  Ne mo\u017eete pozvati deleteRow() na toj poziciji.";
+    t[569] = "Trenutna pozicija pre početka ResultSet-a.  Ne možete pozvati deleteRow() na toj poziciji.";
     t[576] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
     t[577] = "Ilegalna UTF-8 sekvenca: finalna vrednost je zamena vrednosti: {0}";
     t[578] = "Unknown Response Type {0}.";
     t[579] = "Nepoznat tip odziva {0}.";
     t[582] = "Unsupported value for stringtype parameter: {0}";
-    t[583] = "Vrednost za parametar tipa string nije podr\u017eana: {0}";
+    t[583] = "Vrednost za parametar tipa string nije podržana: {0}";
     t[584] = "Conversion to type {0} failed: {1}.";
     t[585] = "Konverzija u tip {0} propala: {1}.";
     t[586] = "This SQLXML object has not been initialized, so you cannot retrieve data from it.";
-    t[587] = "SQLXML objekat nije inicijalizovan tako da nije mogu\u0107e preuzimati podatke iz njega.";
+    t[587] = "SQLXML objekat nije inicijalizovan tako da nije moguće preuzimati podatke iz njega.";
     t[600] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[601] = "Nije mogu\u0107e u\u010ditati kalsu {0} odgovornu za tip podataka {1}";
+    t[601] = "Nije moguće učitati kalsu {0} odgovornu za tip podataka {1}";
     t[604] = "The fastpath function {0} is unknown.";
     t[605] = "Fastpath funkcija {0} je nepoznata.";
     t[608] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[609] = "Pogre\u0161na sintaksa u funkciji ili proceduri na poziciji {0}.";
+    t[609] = "Pogrešna sintaksa u funkciji ili proceduri na poziciji {0}.";
     t[612] = "Provided Reader failed.";
-    t[613] = "Pribavljeni \u010dita\u010d (Reader) zakazao.";
+    t[613] = "Pribavljeni čitač (Reader) zakazao.";
     t[614] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[615] = "Maksimalni broj redova mora biti vrednosti ve\u0107e ili jednake 0.";
+    t[615] = "Maksimalni broj redova mora biti vrednosti veće ili jednake 0.";
     t[616] = "Failed to create object for: {0}.";
-    t[617] = "Propao poku\u0161aj kreiranja objekta za: {0}.";
+    t[617] = "Propao pokušaj kreiranja objekta za: {0}.";
     t[620] = "Conversion of money failed.";
     t[621] = "Konverzija novca (money) propala.";
     t[622] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[623] = "Prevremen zavr\u0161etak ulaznog toka podataka,o\u010dekivano {0} bajtova, a pro\u010ditano samo {1}.";
+    t[623] = "Prevremen završetak ulaznog toka podataka,očekivano {0} bajtova, a pročitano samo {1}.";
     t[626] = "An unexpected result was returned by a query.";
-    t[627] = "Nepredvi\u0111en rezultat je vra\u0107en od strane upita.";
+    t[627] = "Nepredviđen rezultat je vraćen od strane upita.";
     t[644] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
     t[645] = "Preplitanje transakcija nije implementirano. xid={0}, currentXid={1}, state={2}, flags={3}";
     t[646] = "An error occurred while setting up the SSL connection.";
-    t[647] = "Gre\u0161ka se dogodila prilikom pode\u0161avanja SSL konekcije.";
+    t[647] = "Greška se dogodila prilikom podešavanja SSL konekcije.";
     t[654] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
     t[655] = "Ilegalna UTF-8 sekvenca: {0} bytes used to encode a {1} byte value: {2}";
     t[656] = "Not implemented: Prepare must be issued using the same connection that started the transaction. currentXid={0}, prepare xid={1}";
-    t[657] = "Nije implementirano: Spremanje mora biti pozvano uz kori\u0161\u0107enje iste konekcije koja se koristi za startovanje transakcije. currentXid={0}, prepare xid={1}";
+    t[657] = "Nije implementirano: Spremanje mora biti pozvano uz korišćenje iste konekcije koja se koristi za startovanje transakcije. currentXid={0}, prepare xid={1}";
     t[658] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[659] = "SSLSocketFactory klasa koju pru\u017ea {0} se nemo\u017ee instancirati.";
+    t[659] = "SSLSocketFactory klasa koju pruža {0} se nemože instancirati.";
     t[662] = "Failed to convert binary xml data to encoding: {0}.";
-    t[663] = "Neuspe\u0161no konvertovanje binarnih XML podataka u kodnu stranu: {0}.";
+    t[663] = "Neuspešno konvertovanje binarnih XML podataka u kodnu stranu: {0}.";
     t[670] = "Position: {0}";
     t[671] = "Pozicija: {0}";
     t[676] = "Location: File: {0}, Routine: {1}, Line: {2}";
     t[677] = "Lokacija: Fajl: {0}, Rutina: {1}, Linija: {2}";
     t[684] = "Cannot tell if path is open or closed: {0}.";
-    t[685] = "Nije mogu\u0107e utvrditi dali je putanja otvorena ili zatvorena: {0}.";
+    t[685] = "Nije moguće utvrditi dali je putanja otvorena ili zatvorena: {0}.";
     t[690] = "Unable to create StAXResult for SQLXML";
-    t[691] = "Nije mogu\u0107e kreirati StAXResult za SQLXML";
+    t[691] = "Nije moguće kreirati StAXResult za SQLXML";
     t[700] = "Cannot convert an instance of {0} to type {1}";
-    t[701] = "Nije mogu\u0107e konvertovati instancu {0} u tip {1}";
+    t[701] = "Nije moguće konvertovati instancu {0} u tip {1}";
     t[710] = "{0} function takes four and only four argument.";
-    t[711] = "Funkcija {0} prima \u010detiri i samo \u010detiri parametra.";
+    t[711] = "Funkcija {0} prima četiri i samo četiri parametra.";
     t[718] = "Interrupted while attempting to connect.";
-    t[719] = "Prekinut poku\u0161aj konektovanja.";
+    t[719] = "Prekinut pokušaj konektovanja.";
     t[722] = "Your security policy has prevented the connection from being attempted.  You probably need to grant the connect java.net.SocketPermission to the database server host and port that you wish to connect to.";
-    t[723] = "Sigurnosna pode\u0161avanja su spre\u010dila konekciju. Verovatno je potrebno da dozvolite konekciju klasi java.net.SocketPermission na bazu na serveru.";
+    t[723] = "Sigurnosna podešavanja su sprečila konekciju. Verovatno je potrebno da dozvolite konekciju klasi java.net.SocketPermission na bazu na serveru.";
     t[728] = "Failed to initialize LargeObject API";
-    t[729] = "Propao poku\u0161aj inicijalizacije LargeObject API-ja.";
+    t[729] = "Propao pokušaj inicijalizacije LargeObject API-ja.";
     t[734] = "No function outputs were registered.";
     t[735] = "Nije registrovan nikakv izlaz iz funkcije.";
     t[736] = "{0} function takes one and only one argument.";
@@ -311,39 +311,39 @@
     t[744] = "This ResultSet is closed.";
     t[745] = "ResultSet je zatvoren.";
     t[746] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[747] = "Prona\u0111eni su neva\u017ee\u0107i karakter podaci. Uzrok je najverovatnije to \u0161to pohranjeni podaci sadr\u017ee karaktere koji su neva\u017ee\u0107i u setu karaktera sa kojima je baza kreirana.  Npr. \u010cuvanje 8bit podataka u SQL_ASCII bazi podataka.";
+    t[747] = "Pronađeni su nevažeći karakter podaci. Uzrok je najverovatnije to što pohranjeni podaci sadrže karaktere koji su nevažeći u setu karaktera sa kojima je baza kreirana.  Npr. Čuvanje 8bit podataka u SQL_ASCII bazi podataka.";
     t[752] = "Error disabling autocommit";
-    t[753] = "Gre\u0161ka u isklju\u010divanju autokomita";
+    t[753] = "Greška u isključivanju autokomita";
     t[754] = "Ran out of memory retrieving query results.";
     t[755] = "Nestalo je memorije prilikom preuzimanja rezultata upita.";
     t[756] = "Returning autogenerated keys is not supported.";
-    t[757] = "Vra\u0107anje autogenerisanih klju\u010deva nije podr\u017eano.";
+    t[757] = "Vraćanje autogenerisanih ključeva nije podržano.";
     t[760] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
     t[761] = "Operacija zahteva skrolabilan ResultSet,ali ovaj ResultSet je FORWARD_ONLY.";
     t[762] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[763] = "CallableStatement funkcija je izvr\u0161ena dok je izlazni parametar {0} tipa {1} a tip {2} je registrovan kao izlazni parametar.";
+    t[763] = "CallableStatement funkcija je izvršena dok je izlazni parametar {0} tipa {1} a tip {2} je registrovan kao izlazni parametar.";
     t[764] = "Unable to find server array type for provided name {0}.";
-    t[765] = "Neuspe\u0161no nala\u017eenje liste servera za zadato ime {0}.";
+    t[765] = "Neuspešno nalaženje liste servera za zadato ime {0}.";
     t[768] = "Unknown ResultSet holdability setting: {0}.";
-    t[769] = "Nepoznata ResultSet pode\u0161avanja za mogu\u0107nost dr\u017eanja (holdability): {0}.";
+    t[769] = "Nepoznata ResultSet podešavanja za mogućnost držanja (holdability): {0}.";
     t[772] = "Transaction isolation level {0} not supported.";
-    t[773] = "Nivo izolacije transakcije {0} nije podr\u017ean.";
+    t[773] = "Nivo izolacije transakcije {0} nije podržan.";
     t[774] = "Zero bytes may not occur in identifiers.";
     t[775] = "Nula bajtovji se ne smeju pojavljivati u identifikatorima.";
     t[776] = "No results were returned by the query.";
-    t[777] = "Nikakav rezultat nije vra\u0107en od strane upita.";
+    t[777] = "Nikakav rezultat nije vraćen od strane upita.";
     t[778] = "A CallableStatement was executed with nothing returned.";
-    t[779] = "CallableStatement je izvr\u0161en ali ni\u0161ta nije vre\u0107eno kao rezultat.";
+    t[779] = "CallableStatement je izvršen ali ništa nije vrećeno kao rezultat.";
     t[780] = "wasNull cannot be call before fetching a result.";
-    t[781] = "wasNull nemo\u017ee biti pozvan pre zahvatanja rezultata.";
+    t[781] = "wasNull nemože biti pozvan pre zahvatanja rezultata.";
     t[784] = "Returning autogenerated keys by column index is not supported.";
-    t[785] = "Vra\u0107anje autogenerisanih klju\u010deva po kloloni nije podr\u017eano.";
+    t[785] = "Vraćanje autogenerisanih ključeva po kloloni nije podržano.";
     t[786] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[787] = "Izraz ne deklari\u0161e izlazni parametar. Koristite '{' ?= poziv ... '}' za deklarisanje.";
+    t[787] = "Izraz ne deklariše izlazni parametar. Koristite '{' ?= poziv ... '}' za deklarisanje.";
     t[788] = "Can''t use relative move methods while on the insert row.";
-    t[789] = "Ne mo\u017ee se koristiti metod relativnog pomeranja prilikom ubacivanja redova.";
+    t[789] = "Ne može se koristiti metod relativnog pomeranja prilikom ubacivanja redova.";
     t[790] = "A CallableStatement was executed with an invalid number of parameters";
-    t[791] = "CallableStatement je izvr\u0161en sa neva\u017ee\u0107im brojem parametara";
+    t[791] = "CallableStatement je izvršen sa nevažećim brojem parametara";
     t[792] = "Connection is busy with another transaction";
     t[793] = "Konekcija je zauzeta sa drugom transakciom.";
     table = t;
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_tr.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_tr.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_tr.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_tr.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,349 +5,349 @@
   static {
     java.lang.String[] t = new java.lang.String[794];
     t[0] = "";
-    t[1] = "Project-Id-Version: jdbc-tr\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2009-05-31 21:47+0200\nLast-Translator: Devrim G\u00dcND\u00dcZ <devrim@gunduz.org>\nLanguage-Team: Turkish <pgsql-tr-genel@PostgreSQL.org>\nLanguage: tr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.3.1\nX-Poedit-Language: Turkish\nX-Poedit-Country: TURKEY\n";
+    t[1] = "Project-Id-Version: jdbc-tr\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2009-05-31 21:47+0200\nLast-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\nLanguage-Team: Turkish <pgsql-tr-genel@PostgreSQL.org>\nLanguage: tr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: KBabel 1.3.1\nX-Poedit-Language: Turkish\nX-Poedit-Country: TURKEY\n";
     t[4] = "DataSource has been closed.";
-    t[5] = "DataSource kapat\u0131ld\u0131.";
+    t[5] = "DataSource kapatıldı.";
     t[8] = "Invalid flags {0}";
-    t[9] = "Ge\u00e7ersiz se\u00e7enekler {0}";
+    t[9] = "Geçersiz seçenekler {0}";
     t[18] = "Where: {0}";
     t[19] = "Where: {0}";
     t[24] = "Unknown XML Source class: {0}";
-    t[25] = "Bilinmeyen XML Kaynak S\u0131n\u0131f\u0131: {0}";
+    t[25] = "Bilinmeyen XML Kaynak Sınıfı: {0}";
     t[26] = "The connection attempt failed.";
-    t[27] = "Ba\u011flant\u0131 denemesi ba\u015far\u0131s\u0131z oldu.";
+    t[27] = "Bağlantı denemesi başarısız oldu.";
     t[28] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[29] = "\u015eu an ResultSet sonucundan sonra konumland\u0131. deleteRow() burada \u00e7a\u011f\u0131rabilirsiniz.";
+    t[29] = "Şu an ResultSet sonucundan sonra konumlandı. deleteRow() burada çağırabilirsiniz.";
     t[32] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[33] = "PreparedStatement ile sorgu sat\u0131r\u0131 alan sorgu y\u00f6ntemleri kullan\u0131lamaz.";
+    t[33] = "PreparedStatement ile sorgu satırı alan sorgu yöntemleri kullanılamaz.";
     t[36] = "Multiple ResultSets were returned by the query.";
-    t[37] = "Sorgu taraf\u0131ndan birden fazla ResultSet getirildi.";
+    t[37] = "Sorgu tarafından birden fazla ResultSet getirildi.";
     t[50] = "Too many update results were returned.";
-    t[51] = "\u00c7ok fazla g\u00fcncelleme sonucu d\u00f6nd\u00fcr\u00fcld\u00fc.";
+    t[51] = "Çok fazla güncelleme sonucu döndürüldü.";
     t[58] = "Illegal UTF-8 sequence: initial byte is {0}: {1}";
-    t[59] = "Ge\u00e7ersiz UTF-8 \u00e7oklu bayt karakteri: ilk bayt {0}: {1}";
+    t[59] = "Geçersiz UTF-8 çoklu bayt karakteri: ilk bayt {0}: {1}";
     t[66] = "The column name {0} was not found in this ResultSet.";
-    t[67] = "Bu ResultSet i\u00e7inde {0} s\u00fctun ad\u0131 bulunamad\u0131.";
+    t[67] = "Bu ResultSet içinde {0} sütun adı bulunamadı.";
     t[70] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[71] = "Fastpath call {0} - Integer beklenirken hi\u00e7bir sonu\u00e7 getirilmedi.";
+    t[71] = "Fastpath call {0} - Integer beklenirken hiçbir sonuç getirilmedi.";
     t[74] = "Protocol error.  Session setup failed.";
-    t[75] = "Protokol hatas\u0131.  Oturum kurulumu ba\u015far\u0131s\u0131z oldu.";
+    t[75] = "Protokol hatası.  Oturum kurulumu başarısız oldu.";
     t[76] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[77] = "CallableStatement bildirildi ancak registerOutParameter(1, < bir tip>) tan\u0131t\u0131m\u0131 yap\u0131lmad\u0131.";
+    t[77] = "CallableStatement bildirildi ancak registerOutParameter(1, < bir tip>) tanıtımı yapılmadı.";
     t[78] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[79] = "E\u015f zamanlama CONCUR_READ_ONLY olan ResultSet''ler de\u011fi\u015ftirilemez";
+    t[79] = "Eş zamanlama CONCUR_READ_ONLY olan ResultSet''ler değiştirilemez";
     t[90] = "LOB positioning offsets start at 1.";
-    t[91] = "LOB ba\u011flang\u0131\u00e7 adresi 1Den ba\u015fl\u0131yor";
+    t[91] = "LOB bağlangıç adresi 1Den başlıyor";
     t[92] = "Internal Position: {0}";
     t[93] = "Internal Position: {0}";
     t[96] = "free() was called on this LOB previously";
-    t[97] = "Bu LOB'da free() daha \u00f6nce \u00e7a\u011f\u0131r\u0131ld\u0131";
+    t[97] = "Bu LOB'da free() daha önce çağırıldı";
     t[100] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[101] = "Transaction ortas\u0131nda ge\u00e7erli transactionun read-only \u00f6zell\u011fi de\u011fi\u015ftirilemez.";
+    t[101] = "Transaction ortasında geçerli transactionun read-only özellği değiştirilemez.";
     t[102] = "The JVM claims not to support the {0} encoding.";
-    t[103] = "JVM, {0} dil kodlamas\u0131n\u0131 desteklememektedir.";
+    t[103] = "JVM, {0} dil kodlamasını desteklememektedir.";
     t[108] = "{0} function doesn''t take any argument.";
     t[109] = "{0} fonksiyonu parametre almaz.";
     t[112] = "xid must not be null";
     t[113] = "xid null olamaz";
     t[114] = "Connection has been closed.";
-    t[115] = "Ba\u011flant\u0131 kapat\u0131ld\u0131.";
+    t[115] = "Bağlantı kapatıldı.";
     t[122] = "The server does not support SSL.";
     t[123] = "Sunucu SSL desteklemiyor.";
     t[124] = "Custom type maps are not supported.";
-    t[125] = "\u00d6zel tip e\u015fle\u015ftirmeleri desteklenmiyor.";
+    t[125] = "Özel tip eşleştirmeleri desteklenmiyor.";
     t[140] = "Illegal UTF-8 sequence: byte {0} of {1} byte sequence is not 10xxxxxx: {2}";
-    t[141] = "Ge\u00e7ersiz UTF-8 \u00e7oklu bayt karakteri: {0}/{1} bayt\u0131 10xxxxxx de\u011fildir: {2}";
+    t[141] = "Geçersiz UTF-8 çoklu bayt karakteri: {0}/{1} baytı 10xxxxxx değildir: {2}";
     t[148] = "Hint: {0}";
-    t[149] = "\u0130pucu: {0}";
+    t[149] = "İpucu: {0}";
     t[152] = "Unable to find name datatype in the system catalogs.";
-    t[153] = "Sistem kataloglar\u0131nda name veri tipi bulunam\u0131yor.";
+    t[153] = "Sistem kataloglarında name veri tipi bulunamıyor.";
     t[156] = "Unsupported Types value: {0}";
-    t[157] = "Ge\u00e7ersiz Types de\u011feri: {0}";
+    t[157] = "Geçersiz Types değeri: {0}";
     t[158] = "Unknown type {0}.";
     t[159] = "Bilinmeyen tip {0}.";
     t[166] = "{0} function takes two and only two arguments.";
     t[167] = "{0} fonksiyonunu sadece iki parametre alabilir.";
     t[170] = "Finalizing a Connection that was never closed:";
-    t[171] = "Kapat\u0131lmam\u0131\u015f ba\u011flant\u0131 sonland\u0131r\u0131l\u0131yor.";
+    t[171] = "Kapatılmamış bağlantı sonlandırılıyor.";
     t[180] = "The maximum field size must be a value greater than or equal to 0.";
-    t[181] = "En b\u00fcy\u00fck alan boyutu s\u0131f\u0131r ya da s\u0131f\u0131rdan b\u00fcy\u00fck bir de\u011fer olmal\u0131.";
+    t[181] = "En büyük alan boyutu sıfır ya da sıfırdan büyük bir değer olmalı.";
     t[186] = "PostgreSQL LOBs can only index to: {0}";
-    t[187] = "PostgreSQL LOB g\u00f6stergeleri sadece {0} referans edebilir";
+    t[187] = "PostgreSQL LOB göstergeleri sadece {0} referans edebilir";
     t[194] = "Method {0} is not yet implemented.";
-    t[195] = "{0} y\u00f6ntemi hen\u00fcz kodlanmad\u0131.";
+    t[195] = "{0} yöntemi henüz kodlanmadı.";
     t[198] = "Error loading default settings from driverconfig.properties";
-    t[199] = "driverconfig.properties dosyas\u0131ndan varsay\u0131lan ayarlar\u0131 y\u00fckleme hatas\u0131";
+    t[199] = "driverconfig.properties dosyasından varsayılan ayarları yükleme hatası";
     t[200] = "Results cannot be retrieved from a CallableStatement before it is executed.";
-    t[201] = "CallableStatement \u00e7al\u0131\u015ft\u0131r\u0131lmadan sonu\u00e7lar ondan al\u0131namaz.";
+    t[201] = "CallableStatement çalıştırılmadan sonuçlar ondan alınamaz.";
     t[202] = "Large Objects may not be used in auto-commit mode.";
-    t[203] = "Auto-commit bi\u00e7imde large object kullan\u0131lamaz.";
+    t[203] = "Auto-commit biçimde large object kullanılamaz.";
     t[208] = "Expected command status BEGIN, got {0}.";
-    t[209] = "BEGIN komut durumunu beklenirken {0} al\u0131nd\u0131.";
+    t[209] = "BEGIN komut durumunu beklenirken {0} alındı.";
     t[218] = "Invalid fetch direction constant: {0}.";
-    t[219] = "Getirme y\u00f6n\u00fc de\u011fi\u015fmezi ge\u00e7ersiz: {0}.";
+    t[219] = "Getirme yönü değişmezi geçersiz: {0}.";
     t[222] = "{0} function takes three and only three arguments.";
-    t[223] = "{0} fonksiyonunu sadece \u00fc\u00e7 parametre alabilir.";
+    t[223] = "{0} fonksiyonunu sadece üç parametre alabilir.";
     t[226] = "This SQLXML object has already been freed.";
-    t[227] = "Bu SQLXML nesnesi zaten bo\u015falt\u0131lm\u0131\u015f.";
+    t[227] = "Bu SQLXML nesnesi zaten boşaltılmış.";
     t[228] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[229] = "ResultSet, sonu\u00e7lar\u0131n ilk kayd\u0131ndan \u00f6nce veya son kayd\u0131ndan sonra oldu\u011fu i\u00e7in g\u00fcncelleme yap\u0131lamamaktad\u0131r.";
+    t[229] = "ResultSet, sonuçların ilk kaydından önce veya son kaydından sonra olduğu için güncelleme yapılamamaktadır.";
     t[230] = "The JVM claims not to support the encoding: {0}";
-    t[231] = "JVM, {0} dil kodlamas\u0131n\u0131 desteklememektedir.";
+    t[231] = "JVM, {0} dil kodlamasını desteklememektedir.";
     t[232] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[233] = "{0} tipinde parametre tan\u0131t\u0131ld\u0131, ancak {1} (sqltype={2}) tipinde geri getirmek i\u00e7in \u00e7a\u011fr\u0131 yap\u0131ld\u0131.";
+    t[233] = "{0} tipinde parametre tanıtıldı, ancak {1} (sqltype={2}) tipinde geri getirmek için çağrı yapıldı.";
     t[234] = "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, currentXid={2}";
-    t[235] = "Haz\u0131rlanm\u0131\u015f transaction rollback hatas\u0131. rollback xid={0}, preparedXid={1}, currentXid={2}";
+    t[235] = "Hazırlanmış transaction rollback hatası. rollback xid={0}, preparedXid={1}, currentXid={2}";
     t[240] = "Cannot establish a savepoint in auto-commit mode.";
-    t[241] = "Auto-commit bi\u00e7imde savepoint olu\u015fturulam\u0131yor.";
+    t[241] = "Auto-commit biçimde savepoint oluşturulamıyor.";
     t[242] = "Cannot retrieve the id of a named savepoint.";
-    t[243] = "Adland\u0131r\u0131lm\u0131\u015f savepointin id de\u011ferine eri\u015filemiyor.";
+    t[243] = "Adlandırılmış savepointin id değerine erişilemiyor.";
     t[244] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[245] = "S\u00fctun g\u00e7stergesi kapsam d\u0131\u015f\u0131d\u0131r: {0}, s\u00fctun say\u0131s\u0131: {1}.";
+    t[245] = "Sütun gçstergesi kapsam dışıdır: {0}, sütun sayısı: {1}.";
     t[250] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[251] = "S\u0131rad\u0131\u015f\u0131 bir durum s\u00fcr\u00fcc\u00fcn\u00fcn hata vermesine sebep oldu. L\u00fctfen bu durumu geli\u015ftiricilere bildirin.";
+    t[251] = "Sıradışı bir durum sürücünün hata vermesine sebep oldu. Lütfen bu durumu geliştiricilere bildirin.";
     t[260] = "Cannot cast an instance of {0} to type {1}";
-    t[261] = "{0} tipi {1} tipine d\u00f6n\u00fc\u015ft\u00fcr\u00fclemiyor";
+    t[261] = "{0} tipi {1} tipine dönüştürülemiyor";
     t[264] = "Unknown Types value.";
-    t[265] = "Ge\u00e7ersiz Types de\u011feri.";
+    t[265] = "Geçersiz Types değeri.";
     t[266] = "Invalid stream length {0}.";
-    t[267] = "Ge\u00e7ersiz ak\u0131m uzunlu\u011fu {0}.";
+    t[267] = "Geçersiz akım uzunluğu {0}.";
     t[272] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[273] = "Ad\u0131 verilmemi\u015f savepointin id de\u011ferine eri\u015filemiyor.";
+    t[273] = "Adı verilmemiş savepointin id değerine erişilemiyor.";
     t[274] = "Unable to translate data into the desired encoding.";
-    t[275] = "Veri, istenilen dil kodlamas\u0131na \u00e7evrilemiyor.";
+    t[275] = "Veri, istenilen dil kodlamasına çevrilemiyor.";
     t[276] = "Expected an EOF from server, got: {0}";
-    t[277] = "Sunucudan EOF beklendi; ama {0} al\u0131nd\u0131.";
+    t[277] = "Sunucudan EOF beklendi; ama {0} alındı.";
     t[278] = "Bad value for type {0} : {1}";
-    t[279] = "{0} veri tipi i\u00e7in ge\u00e7ersiz de\u011fer : {1}";
+    t[279] = "{0} veri tipi için geçersiz değer : {1}";
     t[280] = "The server requested password-based authentication, but no password was provided.";
-    t[281] = "Sunucu \u015fifre tabanl\u0131 yetkilendirme istedi; ancak bir \u015fifre sa\u011flanmad\u0131.";
+    t[281] = "Sunucu şifre tabanlı yetkilendirme istedi; ancak bir şifre sağlanmadı.";
     t[286] = "Unable to create SAXResult for SQLXML.";
-    t[287] = "SQLXML i\u00e7in SAXResult yarat\u0131lamad\u0131.";
+    t[287] = "SQLXML için SAXResult yaratılamadı.";
     t[292] = "Error during recover";
-    t[293] = "Kurtarma s\u0131ras\u0131nda hata";
+    t[293] = "Kurtarma sırasında hata";
     t[294] = "tried to call end without corresponding start call. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
-    t[295] = "start \u00e7a\u011f\u0131r\u0131m\u0131 olmadan end \u00e7a\u011f\u0131r\u0131lm\u0131\u015ft\u0131r. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
+    t[295] = "start çağırımı olmadan end çağırılmıştır. state={0}, start xid={1}, currentXid={2}, preparedXid={3}";
     t[296] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[297] = "Large objectlerin temizlenmesi 8.3 ve sonraki s\u00fcr\u00fcmlerde kodlanm\u0131\u015ft\u0131r.";
+    t[297] = "Large objectlerin temizlenmesi 8.3 ve sonraki sürümlerde kodlanmıştır.";
     t[298] = "This PooledConnection has already been closed.";
-    t[299] = "Ge\u00e7erli PooledConnection zaten \u00f6nceden kapat\u0131ld\u0131.";
+    t[299] = "Geçerli PooledConnection zaten önceden kapatıldı.";
     t[302] = "ClientInfo property not supported.";
     t[303] = "Clientinfo property'si desteklenememktedir.";
     t[306] = "Fetch size must be a value greater to or equal to 0.";
-    t[307] = "Fetch boyutu s\u0131f\u0131r veya daha b\u00fcy\u00fck bir de\u011fer olmal\u0131d\u0131r.";
+    t[307] = "Fetch boyutu sıfır veya daha büyük bir değer olmalıdır.";
     t[312] = "A connection could not be made using the requested protocol {0}.";
-    t[313] = "\u0130stenilen protokol ile ba\u011flant\u0131 kurulamad\u0131 {0}";
+    t[313] = "İstenilen protokol ile bağlantı kurulamadı {0}";
     t[318] = "Unknown XML Result class: {0}";
-    t[319] = "Bilinmeyen XML Sonu\u00e7 s\u0131n\u0131f\u0131: {0}.";
+    t[319] = "Bilinmeyen XML Sonuç sınıfı: {0}.";
     t[322] = "There are no rows in this ResultSet.";
-    t[323] = "Bu ResultSet i\u00e7inde kay\u0131t bulunamad\u0131.";
+    t[323] = "Bu ResultSet içinde kayıt bulunamadı.";
     t[324] = "Unexpected command status: {0}.";
     t[325] = "Beklenmeyen komut durumu: {0}.";
     t[330] = "Heuristic commit/rollback not supported. forget xid={0}";
     t[331] = "Heuristic commit/rollback desteklenmiyor. forget xid={0}";
     t[334] = "Not on the insert row.";
-    t[335] = "Insert kayd\u0131 de\u011fil.";
+    t[335] = "Insert kaydı değil.";
     t[336] = "This SQLXML object has already been initialized, so you cannot manipulate it further.";
-    t[337] = "Bu SQLXML nesnesi daha \u00f6nceden ilklendirilmi\u015ftir; o y\u00fczden daha fazla m\u00fcdahale edilemez.";
+    t[337] = "Bu SQLXML nesnesi daha önceden ilklendirilmiştir; o yüzden daha fazla müdahale edilemez.";
     t[344] = "Server SQLState: {0}";
     t[345] = "Sunucu SQLState: {0}";
     t[348] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
-    t[349] = "\u0130stemcinin client_standard_conforming_strings parametresi {0} olarak raporland\u0131. JDBC s\u00fcr\u00fcc\u00fcs\u00fc on ya da off olarak bekliyordu.";
+    t[349] = "İstemcinin client_standard_conforming_strings parametresi {0} olarak raporlandı. JDBC sürücüsü on ya da off olarak bekliyordu.";
     t[360] = "The driver currently does not support COPY operations.";
-    t[361] = "Bu sunucu \u015fu a\u015famada COPY i\u015flemleri desteklememktedir.";
+    t[361] = "Bu sunucu şu aşamada COPY işlemleri desteklememktedir.";
     t[364] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[365] = "Dizin g\u00f6stergisi kapsam d\u0131\u015f\u0131d\u0131r: {0}, \u00f6\u011fe say\u0131s\u0131: {1}.";
+    t[365] = "Dizin göstergisi kapsam dışıdır: {0}, öğe sayısı: {1}.";
     t[374] = "suspend/resume not implemented";
     t[375] = "suspend/resume desteklenmiyor";
     t[378] = "Not implemented: one-phase commit must be issued using the same connection that was used to start it";
-    t[379] = "Desteklenmiyor: one-phase commit, i\u015flevinde ba\u015flatan ve bitiren ba\u011flant\u0131 ayn\u0131 olmal\u0131d\u0131r";
+    t[379] = "Desteklenmiyor: one-phase commit, işlevinde başlatan ve bitiren bağlantı aynı olmalıdır";
     t[380] = "Error during one-phase commit. commit xid={0}";
-    t[381] = "One-phase commit s\u0131ras\u0131nda hata. commit xid={0}";
+    t[381] = "One-phase commit sırasında hata. commit xid={0}";
     t[398] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[399] = "Insert edilmi\u015f kayd\u0131n \u00fczerindeyken cancelRowUpdates() \u00e7a\u011f\u0131r\u0131lamaz.";
+    t[399] = "Insert edilmiş kaydın üzerindeyken cancelRowUpdates() çağırılamaz.";
     t[400] = "Cannot reference a savepoint after it has been released.";
-    t[401] = "B\u0131rak\u0131ld\u0131ktan sonra savepoint referans edilemez.";
+    t[401] = "Bırakıldıktan sonra savepoint referans edilemez.";
     t[402] = "You must specify at least one column value to insert a row.";
-    t[403] = "Bir sat\u0131r eklemek i\u00e7in en az bir s\u00fctun de\u011ferini belirtmelisiniz.";
+    t[403] = "Bir satır eklemek için en az bir sütun değerini belirtmelisiniz.";
     t[404] = "Unable to determine a value for MaxIndexKeys due to missing system catalog data.";
-    t[405] = "Sistem katalo\u011fu olmad\u0131\u011f\u0131ndan MaxIndexKeys de\u011ferini tespit edilememektedir.";
+    t[405] = "Sistem kataloğu olmadığından MaxIndexKeys değerini tespit edilememektedir.";
     t[410] = "commit called before end. commit xid={0}, state={1}";
-    t[411] = "commit, sondan \u00f6nce \u00e7a\u011f\u0131r\u0131ld\u0131. commit xid={0}, state={1}";
+    t[411] = "commit, sondan önce çağırıldı. commit xid={0}, state={1}";
     t[412] = "Illegal UTF-8 sequence: final value is out of range: {0}";
-    t[413] = "Ge\u00e7ersiz UTF-8 \u00e7oklu bayt karakteri: son de\u011fer s\u0131ra d\u0131\u015f\u0131d\u0131r: {0}";
+    t[413] = "Geçersiz UTF-8 çoklu bayt karakteri: son değer sıra dışıdır: {0}";
     t[414] = "{0} function takes two or three arguments.";
-    t[415] = "{0} fonksiyonu yaln\u0131z iki veya \u00fc\u00e7 arg\u00fcman alabilir.";
+    t[415] = "{0} fonksiyonu yalnız iki veya üç argüman alabilir.";
     t[428] = "Unable to convert DOMResult SQLXML data to a string.";
-    t[429] = "DOMResult SQLXML verisini diziye d\u00f6n\u00fc\u015ft\u00fcr\u00fclemedi.";
+    t[429] = "DOMResult SQLXML verisini diziye dönüştürülemedi.";
     t[434] = "Unable to decode xml data.";
-    t[435] = "XML verisinin kodu \u00e7\u00f6z\u00fclemedi.";
+    t[435] = "XML verisinin kodu çözülemedi.";
     t[440] = "Unexpected error writing large object to database.";
-    t[441] = "Large object veritaban\u0131na yaz\u0131l\u0131rken beklenmeyan hata.";
+    t[441] = "Large object veritabanına yazılırken beklenmeyan hata.";
     t[442] = "Zero bytes may not occur in string parameters.";
-    t[443] = "String parametrelerinde s\u0131f\u0131r bayt olamaz.";
+    t[443] = "String parametrelerinde sıfır bayt olamaz.";
     t[444] = "A result was returned when none was expected.";
-    t[445] = "Hi\u00e7bir sonu\u00e7 kebklenimezken sonu\u00e7 getirildi.";
+    t[445] = "Hiçbir sonuç kebklenimezken sonuç getirildi.";
     t[446] = "Not implemented: 2nd phase commit must be issued using an idle connection. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
-    t[447] = "Desteklenmiyor: 2nd phase commit, at\u0131l bir ba\u011flant\u0131dan ba\u015flat\u0131lmal\u0131d\u0131r. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
+    t[447] = "Desteklenmiyor: 2nd phase commit, atıl bir bağlantıdan başlatılmalıdır. commit xid={0}, currentXid={1}, state={2], transactionState={3}";
     t[450] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[451] = "ResultSet de\u011fi\u015ftirilemez. Bu sonucu \u00fcreten sorgu tek bir tablodan sorgulamal\u0131 ve tablonun t\u00fcm primary key alanlar\u0131 belirtmelidir. Daha fazla bilgi i\u00e7in bk. JDBC 2.1 API Specification, section 5.6.";
+    t[451] = "ResultSet değiştirilemez. Bu sonucu üreten sorgu tek bir tablodan sorgulamalı ve tablonun tüm primary key alanları belirtmelidir. Daha fazla bilgi için bk. JDBC 2.1 API Specification, section 5.6.";
     t[454] = "Bind message length {0} too long.  This can be caused by very large or incorrect length specifications on InputStream parameters.";
-    t[455] = "Bind mesaj uzunlu\u011fu ({0}) fazla uzun. Bu durum InputStream yaln\u0131\u015f uzunluk belirtimlerden kaynaklanabilir.";
+    t[455] = "Bind mesaj uzunluğu ({0}) fazla uzun. Bu durum InputStream yalnış uzunluk belirtimlerden kaynaklanabilir.";
     t[460] = "Statement has been closed.";
-    t[461] = "Komut kapat\u0131ld\u0131.";
+    t[461] = "Komut kapatıldı.";
     t[462] = "No value specified for parameter {0}.";
-    t[463] = "{0} parametresi i\u00e7in hi\u00e7 bir de\u011fer belirtilmedi.";
+    t[463] = "{0} parametresi için hiç bir değer belirtilmedi.";
     t[468] = "The array index is out of range: {0}";
-    t[469] = "Dizi g\u00f6stergesi kapsam d\u0131\u015f\u0131d\u0131r: {0}";
+    t[469] = "Dizi göstergesi kapsam dışıdır: {0}";
     t[474] = "Unable to bind parameter values for statement.";
-    t[475] = "Komut i\u00e7in parametre de\u011ferlei ba\u011flanamad\u0131.";
+    t[475] = "Komut için parametre değerlei bağlanamadı.";
     t[476] = "Can''t refresh the insert row.";
-    t[477] = "Inser sat\u0131r\u0131 yenilenemiyor.";
+    t[477] = "Inser satırı yenilenemiyor.";
     t[480] = "No primary key found for table {0}.";
     t[481] = "{0} tablosunda primary key yok.";
     t[482] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[483] = "Transaction ortas\u0131nda ge\u00e7erli transactionun transaction isolation level \u00f6zell\u011fi de\u011fi\u015ftirilemez.";
+    t[483] = "Transaction ortasında geçerli transactionun transaction isolation level özellği değiştirilemez.";
     t[498] = "Provided InputStream failed.";
-    t[499] = "Sa\u011flanm\u0131\u015f InputStream ba\u015far\u0131s\u0131z.";
+    t[499] = "Sağlanmış InputStream başarısız.";
     t[500] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[501] = "Dizin g\u00f6stergisi kapsam d\u0131\u015f\u0131d\u0131r: {0}, \u00f6\u011fe say\u0131s\u0131: {1}.";
+    t[501] = "Dizin göstergisi kapsam dışıdır: {0}, öğe sayısı: {1}.";
     t[502] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[503] = "Sunucunun DateStyle parametresi {0} olarak de\u011fi\u015ftirildi. JDBC s\u00fcr\u00fcc\u00fcs\u00fc do\u011fru i\u015flemesi i\u00e7in DateStyle tan\u0131m\u0131n\u0131n ISO i\u015fle ba\u015flamas\u0131n\u0131 gerekir.";
+    t[503] = "Sunucunun DateStyle parametresi {0} olarak değiştirildi. JDBC sürücüsü doğru işlemesi için DateStyle tanımının ISO işle başlamasını gerekir.";
     t[508] = "Connection attempt timed out.";
-    t[509] = "Ba\u011flant\u0131 denemesi zaman a\u015f\u0131m\u0131na u\u011frad\u0131.";
+    t[509] = "Bağlantı denemesi zaman aşımına uğradı.";
     t[512] = "Internal Query: {0}";
     t[513] = "Internal Query: {0}";
     t[514] = "Error preparing transaction. prepare xid={0}";
-    t[515] = "Transaction haz\u0131rlama hatas\u0131. prepare xid={0}";
+    t[515] = "Transaction hazırlama hatası. prepare xid={0}";
     t[518] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[519] = "{0} yetkinlendirme tipi desteklenmemektedir. pg_hba.conf dosyan\u0131z\u0131 istemcinin IP adresini ya da subnetini i\u00e7erecek \u015fekilde ayarlay\u0131p ayarlamad\u0131\u011f\u0131n\u0131z\u0131 ve s\u00fcr\u00fcc\u00fc taraf\u0131ndan desteklenen yetkilendirme y\u00f6ntemlerinden birisini kullan\u0131p kullanmad\u0131\u011f\u0131n\u0131 kontrol ediniz.";
+    t[519] = "{0} yetkinlendirme tipi desteklenmemektedir. pg_hba.conf dosyanızı istemcinin IP adresini ya da subnetini içerecek şekilde ayarlayıp ayarlamadığınızı ve sürücü tarafından desteklenen yetkilendirme yöntemlerinden birisini kullanıp kullanmadığını kontrol ediniz.";
     t[526] = "Interval {0} not yet implemented";
-    t[527] = "{0} aral\u0131\u011f\u0131 hen\u00fcz kodlanmad\u0131.";
+    t[527] = "{0} aralığı henüz kodlanmadı.";
     t[532] = "Conversion of interval failed";
-    t[533] = "Interval d\u00f6n\u00fc\u015ft\u00fcrmesi ba\u015far\u0131s\u0131z.";
+    t[533] = "Interval dönüştürmesi başarısız.";
     t[540] = "Query timeout must be a value greater than or equals to 0.";
-    t[541] = "Sorgu zaman a\u015f\u0131m\u0131 de\u011fer s\u0131f\u0131r veya s\u0131f\u0131rdan b\u00fcy\u00fck bir say\u0131 olmal\u0131d\u0131r.";
+    t[541] = "Sorgu zaman aşımı değer sıfır veya sıfırdan büyük bir sayı olmalıdır.";
     t[542] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[543] = "PooledConnection kapat\u0131ld\u0131\u011f\u0131 i\u00e7in veya ayn\u0131 PooledConnection i\u00e7in yeni bir ba\u011flant\u0131 a\u00e7\u0131ld\u0131\u011f\u0131 i\u00e7in ge\u00e7erli ba\u011flant\u0131 otomatik kapat\u0131ld\u0131.";
+    t[543] = "PooledConnection kapatıldığı için veya aynı PooledConnection için yeni bir bağlantı açıldığı için geçerli bağlantı otomatik kapatıldı.";
     t[544] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[545] = "ResultSet do\u011fru konumlanmam\u0131\u015ft\u0131r, next i\u015flemi \u00e7a\u011f\u0131rman\u0131z gerekir.";
+    t[545] = "ResultSet doğru konumlanmamıştır, next işlemi çağırmanız gerekir.";
     t[546] = "Prepare called before end. prepare xid={0}, state={1}";
-    t[547] = "Sondan \u00f6nce prepare \u00e7a\u011f\u0131r\u0131lm\u0131\u015f. prepare xid={0}, state={1}";
+    t[547] = "Sondan önce prepare çağırılmış. prepare xid={0}, state={1}";
     t[548] = "Invalid UUID data.";
-    t[549] = "Ge\u00e7ersiz UUID verisi.";
+    t[549] = "Geçersiz UUID verisi.";
     t[550] = "This statement has been closed.";
-    t[551] = "Bu komut kapat\u0131ld\u0131.";
+    t[551] = "Bu komut kapatıldı.";
     t[552] = "Can''t infer the SQL type to use for an instance of {0}. Use setObject() with an explicit Types value to specify the type to use.";
-    t[553] = "{0}''nin \u00f6rne\u011fi ile kullan\u0131lacak SQL tip bulunamad\u0131. Kullan\u0131lacak tip belirtmek i\u00e7in kesin Types de\u011ferleri ile setObject() kullan\u0131n.";
+    t[553] = "{0}''nin örneği ile kullanılacak SQL tip bulunamadı. Kullanılacak tip belirtmek için kesin Types değerleri ile setObject() kullanın.";
     t[554] = "Cannot call updateRow() when on the insert row.";
-    t[555] = "Insert  kayd\u0131 \u00fczerinde updateRow() \u00e7a\u011f\u0131r\u0131lamaz.";
+    t[555] = "Insert  kaydı üzerinde updateRow() çağırılamaz.";
     t[562] = "Detail: {0}";
-    t[563] = "Ayr\u0131nt\u0131: {0}";
+    t[563] = "Ayrıntı: {0}";
     t[566] = "Cannot call deleteRow() when on the insert row.";
-    t[567] = "Insert  kayd\u0131 \u00fczerinde deleteRow() \u00e7a\u011f\u0131r\u0131lamaz.";
+    t[567] = "Insert  kaydı üzerinde deleteRow() çağırılamaz.";
     t[568] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[569] = "\u015eu an ResultSet ba\u015flangc\u0131\u0131ndan \u00f6nce konumland\u0131. deleteRow() burada \u00e7a\u011f\u0131rabilirsiniz.";
+    t[569] = "Şu an ResultSet başlangcıından önce konumlandı. deleteRow() burada çağırabilirsiniz.";
     t[576] = "Illegal UTF-8 sequence: final value is a surrogate value: {0}";
-    t[577] = "Ge\u00e7ersiz UTF-8 \u00e7oklu bayt karakteri: son de\u011fer yapay bir de\u011ferdir: {0}";
+    t[577] = "Geçersiz UTF-8 çoklu bayt karakteri: son değer yapay bir değerdir: {0}";
     t[578] = "Unknown Response Type {0}.";
-    t[579] = "Bilinmeyen yan\u0131t tipi {0}";
+    t[579] = "Bilinmeyen yanıt tipi {0}";
     t[582] = "Unsupported value for stringtype parameter: {0}";
-    t[583] = "strinftype parametresi i\u00e7in destekleneyen de\u011fer: {0}";
+    t[583] = "strinftype parametresi için destekleneyen değer: {0}";
     t[584] = "Conversion to type {0} failed: {1}.";
-    t[585] = "{0} veri tipine d\u00f6n\u00fc\u015ft\u00fcrme hatas\u0131: {1}.";
+    t[585] = "{0} veri tipine dönüştürme hatası: {1}.";
     t[586] = "This SQLXML object has not been initialized, so you cannot retrieve data from it.";
-    t[587] = "Bu SQLXML nesnesi ilklendirilmemi\u015f; o y\u00fczden ondan veri alamazs\u0131n\u0131z.";
+    t[587] = "Bu SQLXML nesnesi ilklendirilmemiş; o yüzden ondan veri alamazsınız.";
     t[600] = "Unable to load the class {0} responsible for the datatype {1}";
-    t[601] = "{1} veri tipinden sorumlu {0} s\u0131n\u0131f\u0131 y\u00fcklenemedi";
+    t[601] = "{1} veri tipinden sorumlu {0} sınıfı yüklenemedi";
     t[604] = "The fastpath function {0} is unknown.";
     t[605] = "{0} fastpath fonksiyonu bilinmemektedir.";
     t[608] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[609] = "{0} adresinde fonksiyon veya yordamda ka\u00e7\u0131\u015f s\u00f6z dizimi ge\u00e7ersiz.";
+    t[609] = "{0} adresinde fonksiyon veya yordamda kaçış söz dizimi geçersiz.";
     t[612] = "Provided Reader failed.";
-    t[613] = "Sa\u011flanm\u0131\u015f InputStream ba\u015far\u0131s\u0131z.";
+    t[613] = "Sağlanmış InputStream başarısız.";
     t[614] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[615] = "En b\u00fcy\u00fck getirilecek sat\u0131r say\u0131s\u0131 s\u0131f\u0131rdan b\u00fcy\u00fck olmal\u0131d\u0131r.";
+    t[615] = "En büyük getirilecek satır sayısı sıfırdan büyük olmalıdır.";
     t[616] = "Failed to create object for: {0}.";
-    t[617] = "{0} i\u00e7in nesne olu\u015fturma hatas\u0131.";
+    t[617] = "{0} için nesne oluşturma hatası.";
     t[620] = "Conversion of money failed.";
-    t[621] = "Money d\u00f6n\u00fc\u015ft\u00fcrmesi ba\u015far\u0131s\u0131z.";
+    t[621] = "Money dönüştürmesi başarısız.";
     t[622] = "Premature end of input stream, expected {0} bytes, but only read {1}.";
-    t[623] = "Giri\u015f ak\u0131m\u0131nda beklenmeyen dosya sonu, {0} bayt beklenirken sadece {1} bayt al\u0131nd\u0131.";
+    t[623] = "Giriş akımında beklenmeyen dosya sonu, {0} bayt beklenirken sadece {1} bayt alındı.";
     t[626] = "An unexpected result was returned by a query.";
-    t[627] = "Sorgu beklenmeyen bir sonu\u00e7 d\u00f6nd\u00fcrd\u00fc.";
+    t[627] = "Sorgu beklenmeyen bir sonuç döndürdü.";
     t[644] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
     t[645] = "Transaction interleaving desteklenmiyor. xid={0}, currentXid={1}, state={2}, flags={3}";
     t[646] = "An error occurred while setting up the SSL connection.";
-    t[647] = "SSL ba\u011flant\u0131s\u0131 ayarlan\u0131rken bir hata olu\u015ftu.";
+    t[647] = "SSL bağlantısı ayarlanırken bir hata oluştu.";
     t[654] = "Illegal UTF-8 sequence: {0} bytes used to encode a {1} byte value: {2}";
-    t[655] = "Ge\u00e7ersiz UTF-8 \u00e7oklu bayt karakteri: {0} bayt, {1} bayt de\u011feri kodlamak i\u00e7in kullan\u0131lm\u0131\u015f: {2}";
+    t[655] = "Geçersiz UTF-8 çoklu bayt karakteri: {0} bayt, {1} bayt değeri kodlamak için kullanılmış: {2}";
     t[656] = "Not implemented: Prepare must be issued using the same connection that started the transaction. currentXid={0}, prepare xid={1}";
-    t[657] = "Desteklenmiyor: Prepare, transaction ba\u015flatran ba\u011flant\u0131 taraf\u0131ndan \u00e7a\u011f\u0131rmal\u0131d\u0131r. currentXid={0}, prepare xid={1}";
+    t[657] = "Desteklenmiyor: Prepare, transaction başlatran bağlantı tarafından çağırmalıdır. currentXid={0}, prepare xid={1}";
     t[658] = "The SSLSocketFactory class provided {0} could not be instantiated.";
-    t[659] = "SSLSocketFactory {0} ile \u00f6rneklenmedi.";
+    t[659] = "SSLSocketFactory {0} ile örneklenmedi.";
     t[662] = "Failed to convert binary xml data to encoding: {0}.";
-    t[663] = "xml verisinin \u015fu dil kodlamas\u0131na \u00e7evirilmesi ba\u015far\u0131s\u0131z oldu: {0}";
+    t[663] = "xml verisinin şu dil kodlamasına çevirilmesi başarısız oldu: {0}";
     t[670] = "Position: {0}";
     t[671] = "Position: {0}";
     t[676] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[677] = "Yer: Dosya: {0}, Yordam: {1}, Sat\u0131r: {2}";
+    t[677] = "Yer: Dosya: {0}, Yordam: {1}, Satır: {2}";
     t[684] = "Cannot tell if path is open or closed: {0}.";
-    t[685] = "Path\u0131n a\u00e7\u0131k m\u0131 kapal\u0131 oldu\u011funu tespit edilemiyor: {0}.";
+    t[685] = "Pathın açık mı kapalı olduğunu tespit edilemiyor: {0}.";
     t[690] = "Unable to create StAXResult for SQLXML";
-    t[691] = "SQLXML i\u00e7in StAXResult yarat\u0131lamad\u0131";
+    t[691] = "SQLXML için StAXResult yaratılamadı";
     t[700] = "Cannot convert an instance of {0} to type {1}";
-    t[701] = "{0} instance, {1} tipine d\u00f6n\u00fc\u015ft\u00fcr\u00fclemiyor";
+    t[701] = "{0} instance, {1} tipine dönüştürülemiyor";
     t[710] = "{0} function takes four and only four argument.";
-    t[711] = "{0} fonksiyonunu yaln\u0131z d\u00f6rt parametre alabilir.";
+    t[711] = "{0} fonksiyonunu yalnız dört parametre alabilir.";
     t[718] = "Interrupted while attempting to connect.";
-    t[719] = "Ba\u011flan\u0131rken kesildi.";
+    t[719] = "Bağlanırken kesildi.";
     t[722] = "Your security policy has prevented the connection from being attempted.  You probably need to grant the connect java.net.SocketPermission to the database server host and port that you wish to connect to.";
-    t[723] = "G\u00fcvenlik politikan\u0131z ba\u011flant\u0131n\u0131n kurulmas\u0131n\u0131 engelledi. java.net.SocketPermission'a veritaban\u0131na ve de ba\u011flanaca\u011f\u0131 porta ba\u011flant\u0131 izni vermelisiniz.";
+    t[723] = "Güvenlik politikanız bağlantının kurulmasını engelledi. java.net.SocketPermission'a veritabanına ve de bağlanacağı porta bağlantı izni vermelisiniz.";
     t[728] = "Failed to initialize LargeObject API";
-    t[729] = "LArgeObject API ilklendirme hatas\u0131";
+    t[729] = "LArgeObject API ilklendirme hatası";
     t[734] = "No function outputs were registered.";
-    t[735] = "Hi\u00e7bir fonksiyon \u00e7\u0131kt\u0131s\u0131 kaydedilmedi.";
+    t[735] = "Hiçbir fonksiyon çıktısı kaydedilmedi.";
     t[736] = "{0} function takes one and only one argument.";
-    t[737] = "{0} fonksiyonunu yaln\u0131z tek bir parametre alabilir.";
+    t[737] = "{0} fonksiyonunu yalnız tek bir parametre alabilir.";
     t[744] = "This ResultSet is closed.";
-    t[745] = "ResultSet kapal\u0131d\u0131r.";
+    t[745] = "ResultSet kapalıdır.";
     t[746] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[747] = "Ge\u00e7ersiz karakterler bulunmu\u015ftur. Bunun sebebi, verilerde veritaban\u0131n destekledi\u011fi dil kodlamadaki karakterlerin d\u0131\u015f\u0131nda bir karaktere rastlamas\u0131d\u0131r. Bunun en yayg\u0131n \u00f6rne\u011fi 8 bitlik veriyi SQL_ASCII veritaban\u0131nda saklamas\u0131d\u0131r.";
+    t[747] = "Geçersiz karakterler bulunmuştur. Bunun sebebi, verilerde veritabanın desteklediği dil kodlamadaki karakterlerin dışında bir karaktere rastlamasıdır. Bunun en yaygın örneği 8 bitlik veriyi SQL_ASCII veritabanında saklamasıdır.";
     t[752] = "Error disabling autocommit";
-    t[753] = "autocommit'i devre d\u0131\u015f\u0131 b\u0131rakma s\u0131ras\u0131nda hata";
+    t[753] = "autocommit'i devre dışı bırakma sırasında hata";
     t[754] = "Ran out of memory retrieving query results.";
-    t[755] = "Sorgu sonu\u00e7lar\u0131 al\u0131n\u0131rken bellek yetersiz.";
+    t[755] = "Sorgu sonuçları alınırken bellek yetersiz.";
     t[756] = "Returning autogenerated keys is not supported.";
-    t[757] = "Otomatik \u00fcretilen de\u011ferlerin getirilmesi desteklenememktedir.";
+    t[757] = "Otomatik üretilen değerlerin getirilmesi desteklenememktedir.";
     t[760] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[761] = "\u0130\u015flem, kayd\u0131r\u0131labilen ResultSet gerektirir, ancak bu ResultSet FORWARD_ONLYdir.";
+    t[761] = "İşlem, kaydırılabilen ResultSet gerektirir, ancak bu ResultSet FORWARD_ONLYdir.";
     t[762] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[763] = "CallableStatement \u00e7al\u0131\u015ft\u0131r\u0131ld\u0131, ancak {2} tipi kaydedilmesine ra\u011fmen d\u00f6nd\u00fcrme parametresi {0} ve tipi {1} idi.";
+    t[763] = "CallableStatement çalıştırıldı, ancak {2} tipi kaydedilmesine rağmen döndürme parametresi {0} ve tipi {1} idi.";
     t[764] = "Unable to find server array type for provided name {0}.";
-    t[765] = "Belirtilen {0} ad\u0131 i\u00e7in sunucu array tipi bulunamad\u0131.";
+    t[765] = "Belirtilen {0} adı için sunucu array tipi bulunamadı.";
     t[768] = "Unknown ResultSet holdability setting: {0}.";
-    t[769] = "ResultSet tutabilme ayar\u0131 ge\u00e7ersiz: {0}.";
+    t[769] = "ResultSet tutabilme ayarı geçersiz: {0}.";
     t[772] = "Transaction isolation level {0} not supported.";
     t[773] = "Transaction isolation level {0} desteklenmiyor.";
     t[774] = "Zero bytes may not occur in identifiers.";
-    t[775] = "Belirte\u00e7lerde s\u0131f\u0131r bayt olamaz.";
+    t[775] = "Belirteçlerde sıfır bayt olamaz.";
     t[776] = "No results were returned by the query.";
-    t[777] = "Sorgudan hi\u00e7 bir sonu\u00e7 d\u00f6nmedi.";
+    t[777] = "Sorgudan hiç bir sonuç dönmedi.";
     t[778] = "A CallableStatement was executed with nothing returned.";
-    t[779] = "CallableStatement \u00e7al\u0131\u015ft\u0131rma sonucunda veri getirilmedi.";
+    t[779] = "CallableStatement çalıştırma sonucunda veri getirilmedi.";
     t[780] = "wasNull cannot be call before fetching a result.";
-    t[781] = "wasNull sonu\u00e7 \u00e7ekmeden \u00f6nce \u00e7a\u011f\u0131r\u0131lamaz.";
+    t[781] = "wasNull sonuç çekmeden önce çağırılamaz.";
     t[784] = "Returning autogenerated keys by column index is not supported.";
-    t[785] = "Kolonlar\u0131n indexlenmesi ile otomatik olarak olu\u015fturulan anahtarlar\u0131n d\u00f6nd\u00fcr\u00fclmesi desteklenmiyor.";
+    t[785] = "Kolonların indexlenmesi ile otomatik olarak oluşturulan anahtarların döndürülmesi desteklenmiyor.";
     t[786] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[787] = "Bu komut OUT parametresi bildirmemektedir.  Bildirmek i\u00e7in '{' ?= call ... '}' kullan\u0131n.";
+    t[787] = "Bu komut OUT parametresi bildirmemektedir.  Bildirmek için '{' ?= call ... '}' kullanın.";
     t[788] = "Can''t use relative move methods while on the insert row.";
-    t[789] = "Insert kayd\u0131 \u00fczerinde relative move method kullan\u0131lamaz.";
+    t[789] = "Insert kaydı üzerinde relative move method kullanılamaz.";
     t[790] = "A CallableStatement was executed with an invalid number of parameters";
-    t[791] = "CallableStatement ge\u00e7ersiz say\u0131da parametre ile \u00e7al\u0131\u015ft\u0131r\u0131ld\u0131.";
+    t[791] = "CallableStatement geçersiz sayıda parametre ile çalıştırıldı.";
     t[792] = "Connection is busy with another transaction";
-    t[793] = "Ba\u011flant\u0131, ba\u015fka bir transaction taraf\u0131ndan me\u015fgul ediliyor";
+    t[793] = "Bağlantı, başka bir transaction tarafından meşgul ediliyor";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_CN.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_CN.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_CN.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_CN.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,233 +5,233 @@
   static {
     java.lang.String[] t = new java.lang.String[578];
     t[0] = "";
-    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.3\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2008-01-31 14:34+0800\nLast-Translator: \u90ed\u671d\u76ca(ChaoYi, Kuo) <Kuo.ChaoYi@gmail.com>\nLanguage-Team: The PostgreSQL Development Team <Kuo.ChaoYi@gmail.com>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Chinese\nX-Poedit-Country: CHINA\nX-Poedit-SourceCharset: utf-8\n";
+    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.3\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2008-01-31 14:34+0800\nLast-Translator: 郭朝益(ChaoYi, Kuo) <Kuo.ChaoYi@gmail.com>\nLanguage-Team: The PostgreSQL Development Team <Kuo.ChaoYi@gmail.com>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Chinese\nX-Poedit-Country: CHINA\nX-Poedit-SourceCharset: utf-8\n";
     t[6] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[7] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u6570\u636e\u5217\u4e0a\u547c\u53eb cancelRowUpdates()\u3002";
+    t[7] = "不能在新增的数据列上呼叫 cancelRowUpdates()。";
     t[8] = "The server requested password-based authentication, but no password was provided.";
-    t[9] = "\u670d\u52a1\u5668\u8981\u6c42\u4f7f\u7528\u5bc6\u7801\u9a8c\u8bc1\uff0c\u4f46\u662f\u5bc6\u7801\u5e76\u672a\u63d0\u4f9b\u3002";
+    t[9] = "服务器要求使用密码验证，但是密码并未提供。";
     t[12] = "Detail: {0}";
-    t[13] = "\u8be6\u7ec6\uff1a{0}";
+    t[13] = "详细：{0}";
     t[16] = "Can''t refresh the insert row.";
-    t[17] = "\u65e0\u6cd5\u91cd\u8bfb\u65b0\u589e\u7684\u6570\u636e\u5217\u3002";
+    t[17] = "无法重读新增的数据列。";
     t[18] = "Connection has been closed.";
-    t[19] = "Connection \u5df2\u7ecf\u88ab\u5173\u95ed\u3002";
+    t[19] = "Connection 已经被关闭。";
     t[24] = "Bad value for type {0} : {1}";
-    t[25] = "\u4e0d\u826f\u7684\u7c7b\u578b\u503c {0} : {1}";
+    t[25] = "不良的类型值 {0} : {1}";
     t[34] = "Failed to initialize LargeObject API";
-    t[35] = "\u521d\u59cb\u5316 LargeObject API \u5931\u8d25";
+    t[35] = "初始化 LargeObject API 失败";
     t[36] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[37] = "\u5927\u578b\u5bf9\u8c61\u7684\u622a\u65ad(Truncation)\u4ec5\u88ab\u5b9e\u4f5c\u6267\u884c\u5728 8.3 \u548c\u540e\u6765\u7684\u670d\u52a1\u5668\u3002";
+    t[37] = "大型对象的截断(Truncation)仅被实作执行在 8.3 和后来的服务器。";
     t[40] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[41] = "\u65e0\u6cd5\u53d6\u5f97\u672a\u547d\u540d\u50a8\u5b58\u70b9(Savepoint)\u7684\u540d\u79f0\u3002";
+    t[41] = "无法取得未命名储存点(Savepoint)的名称。";
     t[46] = "An error occurred while setting up the SSL connection.";
-    t[47] = "\u8fdb\u884c SSL \u8fde\u7ebf\u65f6\u53d1\u751f\u9519\u8bef\u3002";
+    t[47] = "进行 SSL 连线时发生错误。";
     t[50] = "suspend/resume not implemented";
-    t[51] = "\u6682\u505c(suspend)/\u518d\u7ee7\u7eed(resume)\u5c1a\u672a\u88ab\u5b9e\u4f5c\u3002";
+    t[51] = "暂停(suspend)/再继续(resume)尚未被实作。";
     t[60] = "{0} function takes one and only one argument.";
-    t[61] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e00\u4e2a\u4e14\u4ec5\u6709\u4e00\u4e2a\u5f15\u6570\u3002";
+    t[61] = "{0} 函式取得一个且仅有一个引数。";
     t[62] = "Conversion to type {0} failed: {1}.";
-    t[63] = "\u8f6c\u6362\u7c7b\u578b {0} \u5931\u8d25\uff1a{1}\u3002";
+    t[63] = "转换类型 {0} 失败：{1}。";
     t[66] = "Conversion of money failed.";
-    t[67] = "money \u8f6c\u6362\u5931\u8d25\u3002";
+    t[67] = "money 转换失败。";
     t[70] = "A result was returned when none was expected.";
-    t[71] = "\u4f20\u56de\u9884\u671f\u4e4b\u5916\u7684\u7ed3\u679c\u3002";
+    t[71] = "传回预期之外的结果。";
     t[80] = "This PooledConnection has already been closed.";
-    t[81] = "\u8fd9\u4e2a PooledConnection \u5df2\u7ecf\u88ab\u5173\u95ed\u3002";
+    t[81] = "这个 PooledConnection 已经被关闭。";
     t[84] = "Multiple ResultSets were returned by the query.";
-    t[85] = "\u67e5\u8be2\u4f20\u56de\u591a\u4e2a ResultSet\u3002";
+    t[85] = "查询传回多个 ResultSet。";
     t[90] = "Not on the insert row.";
-    t[91] = "\u4e0d\u5728\u65b0\u589e\u7684\u6570\u636e\u5217\u4e0a\u3002";
+    t[91] = "不在新增的数据列上。";
     t[94] = "An unexpected result was returned by a query.";
-    t[95] = "\u4f20\u56de\u975e\u9884\u671f\u7684\u67e5\u8be2\u7ed3\u679c\u3002";
+    t[95] = "传回非预期的查询结果。";
     t[102] = "Internal Query: {0}";
-    t[103] = "\u5185\u90e8\u67e5\u8be2\uff1a{0}";
+    t[103] = "内部查询：{0}";
     t[106] = "The array index is out of range: {0}";
-    t[107] = "\u9635\u5217\u7d22\u5f15\u8d85\u8fc7\u8bb8\u53ef\u8303\u56f4\uff1a{0}";
+    t[107] = "阵列索引超过许可范围：{0}";
     t[112] = "Connection attempt timed out.";
-    t[113] = "Connection \u5c1d\u8bd5\u903e\u65f6\u3002";
+    t[113] = "Connection 尝试逾时。";
     t[114] = "Unable to find name datatype in the system catalogs.";
-    t[115] = "\u5728\u7cfb\u7edf catalog \u4e2d\u627e\u4e0d\u5230\u540d\u79f0\u6570\u636e\u7c7b\u578b(datatype)\u3002";
+    t[115] = "在系统 catalog 中找不到名称数据类型(datatype)。";
     t[116] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[117] = "\u4e0d\u660e\u7684\u539f\u56e0\u5bfc\u81f4\u9a71\u52a8\u7a0b\u5e8f\u9020\u6210\u5931\u8d25\uff0c\u8bf7\u56de\u62a5\u8fd9\u4e2a\u4f8b\u5916\u3002";
+    t[117] = "不明的原因导致驱动程序造成失败，请回报这个例外。";
     t[120] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[121] = "\u9635\u5217\u7d22\u5f15\u8d85\u8fc7\u8bb8\u53ef\u8303\u56f4\uff1a{0}\uff0c\u5143\u7d20\u6570\u91cf\uff1a{1}\u3002";
+    t[121] = "阵列索引超过许可范围：{0}，元素数量：{1}。";
     t[138] = "Invalid flags {0}";
-    t[139] = "\u65e0\u6548\u7684\u65d7\u6807 flags {0}";
+    t[139] = "无效的旗标 flags {0}";
     t[146] = "Unexpected error writing large object to database.";
-    t[147] = "\u5c06\u5927\u578b\u5bf9\u8c61(large object)\u5199\u5165\u6570\u636e\u5e93\u65f6\u53d1\u751f\u4e0d\u660e\u9519\u8bef\u3002";
+    t[147] = "将大型对象(large object)写入数据库时发生不明错误。";
     t[162] = "Query timeout must be a value greater than or equals to 0.";
-    t[163] = "\u67e5\u8be2\u903e\u65f6\u7b49\u5019\u65f6\u95f4\u5fc5\u987b\u5927\u4e8e\u6216\u7b49\u4e8e 0\u3002";
+    t[163] = "查询逾时等候时间必须大于或等于 0。";
     t[170] = "Unknown type {0}.";
-    t[171] = "\u4e0d\u660e\u7684\u7c7b\u578b {0}";
+    t[171] = "不明的类型 {0}";
     t[174] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
-    t[175] = "\u8fd9\u670d\u52a1\u5668\u7684 standard_conforming_strings \u53c2\u6570\u5df2\u56de\u62a5\u4e3a {0}\uff0cJDBC \u9a71\u52a8\u7a0b\u5e8f\u5df2\u9884\u671f\u5f00\u542f\u6216\u662f\u5173\u95ed\u3002";
+    t[175] = "这服务器的 standard_conforming_strings 参数已回报为 {0}，JDBC 驱动程序已预期开启或是关闭。";
     t[176] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[177] = "\u53d1\u73b0\u4e0d\u5408\u6cd5\u7684\u5b57\u5143\uff0c\u53ef\u80fd\u7684\u539f\u56e0\u662f\u6b32\u50a8\u5b58\u7684\u6570\u636e\u4e2d\u5305\u542b\u6570\u636e\u5e93\u7684\u5b57\u5143\u96c6\u4e0d\u652f\u63f4\u7684\u5b57\u7801\uff0c\u5176\u4e2d\u6700\u5e38\u89c1\u4f8b\u5b50\u7684\u5c31\u662f\u5c06 8 \u4f4d\u5143\u6570\u636e\u5b58\u5165\u4f7f\u7528 SQL_ASCII \u7f16\u7801\u7684\u6570\u636e\u5e93\u4e2d\u3002";
+    t[177] = "发现不合法的字元，可能的原因是欲储存的数据中包含数据库的字元集不支援的字码，其中最常见例子的就是将 8 位元数据存入使用 SQL_ASCII 编码的数据库中。";
     t[178] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[179] = "\u680f\u4f4d\u7d22\u5f15\u8d85\u8fc7\u8bb8\u53ef\u8303\u56f4\uff1a{0}\uff0c\u680f\u4f4d\u6570\uff1a{1}\u3002";
+    t[179] = "栏位索引超过许可范围：{0}，栏位数：{1}。";
     t[180] = "The connection attempt failed.";
-    t[181] = "\u5c1d\u8bd5\u8fde\u7ebf\u5df2\u5931\u8d25\u3002";
+    t[181] = "尝试连线已失败。";
     t[182] = "No value specified for parameter {0}.";
-    t[183] = "\u672a\u8bbe\u5b9a\u53c2\u6570\u503c {0} \u7684\u5185\u5bb9\u3002";
+    t[183] = "未设定参数值 {0} 的内容。";
     t[190] = "Provided Reader failed.";
-    t[191] = "\u63d0\u4f9b\u7684 Reader \u5df2\u5931\u8d25\u3002";
+    t[191] = "提供的 Reader 已失败。";
     t[194] = "Unsupported value for stringtype parameter: {0}";
-    t[195] = "\u5b57\u7b26\u7c7b\u578b\u53c2\u6570\u503c\u672a\u88ab\u652f\u6301\uff1a{0}";
+    t[195] = "字符类型参数值未被支持：{0}";
     t[198] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[199] = "\u5df2\u7ecf\u5ba3\u544a CallableStatement \u51fd\u5f0f\uff0c\u4f46\u662f\u5c1a\u672a\u547c\u53eb registerOutParameter (1, <some_type>) \u3002";
+    t[199] = "已经宣告 CallableStatement 函式，但是尚未呼叫 registerOutParameter (1, <some_type>) 。";
     t[204] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[205] = "\u4e0d\u80fd\u5728 ResultSet \u7684\u7b2c\u4e00\u7b14\u6570\u636e\u4e4b\u524d\u547c\u53eb deleteRow()\u3002";
+    t[205] = "不能在 ResultSet 的第一笔数据之前呼叫 deleteRow()。";
     t[214] = "The maximum field size must be a value greater than or equal to 0.";
-    t[215] = "\u6700\u5927\u680f\u4f4d\u5bb9\u91cf\u5fc5\u987b\u5927\u4e8e\u6216\u7b49\u4e8e 0\u3002";
+    t[215] = "最大栏位容量必须大于或等于 0。";
     t[216] = "Fetch size must be a value greater to or equal to 0.";
-    t[217] = "\u6570\u636e\u8bfb\u53d6\u7b14\u6570(fetch size)\u5fc5\u987b\u5927\u4e8e\u6216\u7b49\u4e8e 0\u3002";
+    t[217] = "数据读取笔数(fetch size)必须大于或等于 0。";
     t[220] = "PostgreSQL LOBs can only index to: {0}";
-    t[221] = "PostgreSQL LOBs \u4ec5\u80fd\u7d22\u5f15\u5230\uff1a{0}";
+    t[221] = "PostgreSQL LOBs 仅能索引到：{0}";
     t[224] = "The JVM claims not to support the encoding: {0}";
-    t[225] = "JVM \u58f0\u660e\u5e76\u4e0d\u652f\u63f4\u7f16\u7801\uff1a{0} \u3002";
+    t[225] = "JVM 声明并不支援编码：{0} 。";
     t[226] = "Interval {0} not yet implemented";
-    t[227] = "\u9694\u7edd {0} \u5c1a\u672a\u88ab\u5b9e\u4f5c\u3002";
+    t[227] = "隔绝 {0} 尚未被实作。";
     t[238] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[239] = "Fastpath \u547c\u53eb {0} - \u6ca1\u6709\u4f20\u56de\u503c\uff0c\u4e14\u5e94\u8be5\u4f20\u56de\u4e00\u4e2a\u6574\u6570\u3002";
+    t[239] = "Fastpath 呼叫 {0} - 没有传回值，且应该传回一个整数。";
     t[246] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[247] = "ResultSets \u4e0e\u5e76\u53d1\u540c\u4f5c(Concurrency) CONCUR_READ_ONLY \u4e0d\u80fd\u88ab\u66f4\u65b0\u3002";
+    t[247] = "ResultSets 与并发同作(Concurrency) CONCUR_READ_ONLY 不能被更新。";
     t[250] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[251] = "\u8fd9\u4e2a statement \u672a\u5ba3\u544a OUT \u53c2\u6570\uff0c\u4f7f\u7528 '{' ?= call ... '}' \u5ba3\u544a\u4e00\u4e2a\u3002";
+    t[251] = "这个 statement 未宣告 OUT 参数，使用 '{' ?= call ... '}' 宣告一个。";
     t[256] = "Cannot reference a savepoint after it has been released.";
-    t[257] = "\u65e0\u6cd5\u53c2\u7167\u5df2\u7ecf\u88ab\u91ca\u653e\u7684\u50a8\u5b58\u70b9\u3002";
+    t[257] = "无法参照已经被释放的储存点。";
     t[260] = "Unsupported Types value: {0}";
-    t[261] = "\u672a\u88ab\u652f\u6301\u7684\u7c7b\u578b\u503c\uff1a{0}";
+    t[261] = "未被支持的类型值：{0}";
     t[266] = "Protocol error.  Session setup failed.";
-    t[267] = "\u901a\u8baf\u534f\u5b9a\u9519\u8bef\uff0cSession \u521d\u59cb\u5316\u5931\u8d25\u3002";
+    t[267] = "通讯协定错误，Session 初始化失败。";
     t[274] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[275] = "\u4e0d\u80fd\u5728 ResultSet \u7684\u6700\u540e\u4e00\u7b14\u6570\u636e\u4e4b\u540e\u547c\u53eb deleteRow()\u3002";
+    t[275] = "不能在 ResultSet 的最后一笔数据之后呼叫 deleteRow()。";
     t[278] = "Internal Position: {0}";
-    t[279] = "\u5185\u90e8\u4f4d\u7f6e\uff1a{0}";
+    t[279] = "内部位置：{0}";
     t[280] = "Zero bytes may not occur in identifiers.";
-    t[281] = "\u5728\u6807\u8bc6\u8bc6\u522b\u7b26\u4e2d\u4e0d\u5b58\u5728\u96f6\u4f4d\u5143\u7ec4\u3002";
+    t[281] = "在标识识别符中不存在零位元组。";
     t[288] = "{0} function doesn''t take any argument.";
-    t[289] = "{0} \u51fd\u5f0f\u65e0\u6cd5\u53d6\u5f97\u4efb\u4f55\u7684\u5f15\u6570\u3002";
+    t[289] = "{0} 函式无法取得任何的引数。";
     t[300] = "This statement has been closed.";
-    t[301] = "\u8fd9\u4e2a statement \u5df2\u7ecf\u88ab\u5173\u95ed\u3002";
+    t[301] = "这个 statement 已经被关闭。";
     t[318] = "Cannot establish a savepoint in auto-commit mode.";
-    t[319] = "\u5728\u81ea\u52a8\u786e\u8ba4\u4e8b\u7269\u4ea4\u6613\u6a21\u5f0f\u65e0\u6cd5\u5efa\u7acb\u50a8\u5b58\u70b9(Savepoint)\u3002";
+    t[319] = "在自动确认事物交易模式无法建立储存点(Savepoint)。";
     t[320] = "Position: {0}";
-    t[321] = "\u4f4d\u7f6e\uff1a{0}";
+    t[321] = "位置：{0}";
     t[322] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[323] = "\u4e0d\u53ef\u66f4\u65b0\u7684 ResultSet\u3002\u7528\u6765\u4ea7\u751f\u8fd9\u4e2a ResultSet \u7684 SQL \u547d\u4ee4\u53ea\u80fd\u64cd\u4f5c\u4e00\u4e2a\u6570\u636e\u8868\uff0c\u5e76\u4e14\u5fc5\u9700\u9009\u62e9\u6240\u6709\u4e3b\u952e\u680f\u4f4d\uff0c\u8be6\u7ec6\u8bf7\u53c2\u9605 JDBC 2.1 API \u89c4\u683c\u4e66 5.6 \u8282\u3002";
+    t[323] = "不可更新的 ResultSet。用来产生这个 ResultSet 的 SQL 命令只能操作一个数据表，并且必需选择所有主键栏位，详细请参阅 JDBC 2.1 API 规格书 5.6 节。";
     t[330] = "This ResultSet is closed.";
-    t[331] = "\u8fd9\u4e2a ResultSet \u5df2\u7ecf\u88ab\u5173\u95ed\u3002";
+    t[331] = "这个 ResultSet 已经被关闭。";
     t[338] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[339] = "\u5df2\u6ce8\u518c\u53c2\u6570\u7c7b\u578b {0}\uff0c\u4f46\u662f\u53c8\u547c\u53eb\u4e86get{1}(sqltype={2})\u3002";
+    t[339] = "已注册参数类型 {0}，但是又呼叫了get{1}(sqltype={2})。";
     t[342] = "Transaction isolation level {0} not supported.";
-    t[343] = "\u4e0d\u652f\u63f4\u4ea4\u6613\u9694\u7edd\u7b49\u7ea7 {0} \u3002";
+    t[343] = "不支援交易隔绝等级 {0} 。";
     t[344] = "Statement has been closed.";
-    t[345] = "Sstatement \u5df2\u7ecf\u88ab\u5173\u95ed\u3002";
+    t[345] = "Sstatement 已经被关闭。";
     t[352] = "Server SQLState: {0}";
-    t[353] = "\u670d\u52a1\u5668 SQLState\uff1a{0}";
+    t[353] = "服务器 SQLState：{0}";
     t[354] = "No primary key found for table {0}.";
-    t[355] = "{0} \u6570\u636e\u8868\u4e2d\u672a\u627e\u5230\u4e3b\u952e(Primary key)\u3002";
+    t[355] = "{0} 数据表中未找到主键(Primary key)。";
     t[362] = "Cannot convert an instance of {0} to type {1}";
-    t[363] = "\u65e0\u6cd5\u8f6c\u6362 {0} \u5230\u7c7b\u578b {1} \u7684\u5b9e\u4f8b";
+    t[363] = "无法转换 {0} 到类型 {1} 的实例";
     t[364] = "DataSource has been closed.";
-    t[365] = "DataSource \u5df2\u7ecf\u88ab\u5173\u95ed\u3002";
+    t[365] = "DataSource 已经被关闭。";
     t[368] = "The column name {0} was not found in this ResultSet.";
-    t[369] = "ResultSet \u4e2d\u627e\u4e0d\u5230\u680f\u4f4d\u540d\u79f0 {0}\u3002";
+    t[369] = "ResultSet 中找不到栏位名称 {0}。";
     t[372] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[373] = "\u67e5\u8be2\u7ed3\u679c\u6307\u6807\u4f4d\u7f6e\u4e0d\u6b63\u786e\uff0c\u60a8\u4e5f\u8bb8\u9700\u8981\u547c\u53eb ResultSet \u7684 next() \u65b9\u6cd5\u3002";
+    t[373] = "查询结果指标位置不正确，您也许需要呼叫 ResultSet 的 next() 方法。";
     t[378] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[379] = "\u65e0\u6cd5\u66f4\u65b0 ResultSet\uff0c\u53ef\u80fd\u5728\u7b2c\u4e00\u7b14\u6570\u636e\u4e4b\u524d\u6216\u6700\u672a\u7b14\u6570\u636e\u4e4b\u540e\u3002";
+    t[379] = "无法更新 ResultSet，可能在第一笔数据之前或最未笔数据之后。";
     t[380] = "Method {0} is not yet implemented.";
-    t[381] = "\u8fd9\u4e2a {0} \u65b9\u6cd5\u5c1a\u672a\u88ab\u5b9e\u4f5c\u3002";
+    t[381] = "这个 {0} 方法尚未被实作。";
     t[382] = "{0} function takes two or three arguments.";
-    t[383] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e8c\u4e2a\u6216\u4e09\u4e2a\u5f15\u6570\u3002";
+    t[383] = "{0} 函式取得二个或三个引数。";
     t[384] = "The JVM claims not to support the {0} encoding.";
-    t[385] = "JVM \u58f0\u660e\u5e76\u4e0d\u652f\u63f4 {0} \u7f16\u7801\u3002";
+    t[385] = "JVM 声明并不支援 {0} 编码。";
     t[396] = "Unknown Response Type {0}.";
-    t[397] = "\u4e0d\u660e\u7684\u56de\u5e94\u7c7b\u578b {0}\u3002";
+    t[397] = "不明的回应类型 {0}。";
     t[398] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[399] = "\u53c2\u6570\u7d22\u5f15\u8d85\u51fa\u8bb8\u53ef\u8303\u56f4\uff1a{0}\uff0c\u53c2\u6570\u603b\u6570\uff1a{1}\u3002";
+    t[399] = "参数索引超出许可范围：{0}，参数总数：{1}。";
     t[400] = "Where: {0}";
-    t[401] = "\u5728\u4f4d\u7f6e\uff1a{0}";
+    t[401] = "在位置：{0}";
     t[406] = "Cannot call deleteRow() when on the insert row.";
-    t[407] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u6570\u636e\u4e0a\u547c\u53eb deleteRow()\u3002";
+    t[407] = "不能在新增的数据上呼叫 deleteRow()。";
     t[414] = "{0} function takes four and only four argument.";
-    t[415] = "{0} \u51fd\u5f0f\u53d6\u5f97\u56db\u4e2a\u4e14\u4ec5\u6709\u56db\u4e2a\u5f15\u6570\u3002";
+    t[415] = "{0} 函式取得四个且仅有四个引数。";
     t[416] = "Unable to translate data into the desired encoding.";
-    t[417] = "\u65e0\u6cd5\u5c06\u6570\u636e\u8f6c\u6210\u76ee\u6807\u7f16\u7801\u3002";
+    t[417] = "无法将数据转成目标编码。";
     t[424] = "Can''t use relative move methods while on the insert row.";
-    t[425] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u6570\u636e\u5217\u4e0a\u4f7f\u7528\u76f8\u5bf9\u4f4d\u7f6e move \u65b9\u6cd5\u3002";
+    t[425] = "不能在新增的数据列上使用相对位置 move 方法。";
     t[434] = "Invalid stream length {0}.";
-    t[435] = "\u65e0\u6548\u7684\u4e32\u6d41\u957f\u5ea6 {0}.";
+    t[435] = "无效的串流长度 {0}.";
     t[436] = "The driver currently does not support COPY operations.";
-    t[437] = "\u9a71\u52a8\u7a0b\u5e8f\u76ee\u524d\u4e0d\u652f\u63f4 COPY \u64cd\u4f5c\u3002";
+    t[437] = "驱动程序目前不支援 COPY 操作。";
     t[440] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[441] = "\u6700\u5927\u6570\u636e\u8bfb\u53d6\u7b14\u6570\u5fc5\u987b\u5927\u4e8e\u6216\u7b49\u4e8e 0\u3002";
+    t[441] = "最大数据读取笔数必须大于或等于 0。";
     t[446] = "Failed to create object for: {0}.";
-    t[447] = "\u4e3a {0} \u5efa\u7acb\u5bf9\u8c61\u5931\u8d25\u3002";
+    t[447] = "为 {0} 建立对象失败。";
     t[448] = "{0} function takes three and only three arguments.";
-    t[449] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e09\u4e2a\u4e14\u4ec5\u6709\u4e09\u4e2a\u5f15\u6570\u3002";
+    t[449] = "{0} 函式取得三个且仅有三个引数。";
     t[450] = "Conversion of interval failed";
-    t[451] = "\u9694\u7edd(Interval)\u8f6c\u6362\u5931\u8d25\u3002";
+    t[451] = "隔绝(Interval)转换失败。";
     t[452] = "Cannot tell if path is open or closed: {0}.";
-    t[453] = "\u65e0\u6cd5\u5f97\u77e5 path \u662f\u5f00\u542f\u6216\u5173\u95ed\uff1a{0}\u3002";
+    t[453] = "无法得知 path 是开启或关闭：{0}。";
     t[460] = "Provided InputStream failed.";
-    t[461] = "\u63d0\u4f9b\u7684 InputStream \u5df2\u5931\u8d25\u3002";
+    t[461] = "提供的 InputStream 已失败。";
     t[462] = "Invalid fetch direction constant: {0}.";
-    t[463] = "\u65e0\u6548\u7684 fetch \u65b9\u5411\u5e38\u6570\uff1a{0}\u3002";
+    t[463] = "无效的 fetch 方向常数：{0}。";
     t[472] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
-    t[473] = "\u4e8b\u7269\u4ea4\u6613\u9694\u7edd(Transaction interleaving)\u672a\u88ab\u5b9e\u4f5c\u3002xid={0}, currentXid={1}, state={2}, flags={3}";
+    t[473] = "事物交易隔绝(Transaction interleaving)未被实作。xid={0}, currentXid={1}, state={2}, flags={3}";
     t[474] = "{0} function takes two and only two arguments.";
-    t[475] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e8c\u4e2a\u4e14\u4ec5\u6709\u4e8c\u4e2a\u5f15\u6570\u3002";
+    t[475] = "{0} 函式取得二个且仅有二个引数。";
     t[476] = "There are no rows in this ResultSet.";
-    t[477] = "ResultSet \u4e2d\u627e\u4e0d\u5230\u6570\u636e\u5217\u3002";
+    t[477] = "ResultSet 中找不到数据列。";
     t[478] = "Zero bytes may not occur in string parameters.";
-    t[479] = "\u5b57\u7b26\u53c2\u6570\u4e0d\u80fd\u6709 0 \u4e2a\u4f4d\u5143\u7ec4\u3002";
+    t[479] = "字符参数不能有 0 个位元组。";
     t[480] = "Cannot call updateRow() when on the insert row.";
-    t[481] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u6570\u636e\u5217\u4e0a\u547c\u53eb deleteRow()\u3002";
+    t[481] = "不能在新增的数据列上呼叫 deleteRow()。";
     t[482] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[483] = "Connection \u5df2\u81ea\u52a8\u7ed3\u675f\uff0c\u56e0\u4e3a\u4e00\u4e2a\u65b0\u7684  PooledConnection \u8fde\u7ebf\u88ab\u5f00\u542f\u6216\u8005\u6216 PooledConnection \u5df2\u88ab\u5173\u95ed\u3002";
+    t[483] = "Connection 已自动结束，因为一个新的  PooledConnection 连线被开启或者或 PooledConnection 已被关闭。";
     t[488] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[489] = "\u4e00\u4e2a CallableStatement \u6267\u884c\u51fd\u5f0f\u540e\u8f93\u51fa\u7684\u53c2\u6570\u7c7b\u578b\u4e3a {1} \u503c\u4e3a {0}\uff0c\u4f46\u662f\u5df2\u6ce8\u518c\u7684\u7c7b\u578b\u662f {2}\u3002";
+    t[489] = "一个 CallableStatement 执行函式后输出的参数类型为 {1} 值为 {0}，但是已注册的类型是 {2}。";
     t[494] = "Cannot cast an instance of {0} to type {1}";
-    t[495] = "\u4e0d\u80fd\u8f6c\u6362\u4e00\u4e2a {0} \u5b9e\u4f8b\u5230\u7c7b\u578b {1}";
+    t[495] = "不能转换一个 {0} 实例到类型 {1}";
     t[498] = "Cannot retrieve the id of a named savepoint.";
-    t[499] = "\u65e0\u6cd5\u53d6\u5f97\u5df2\u547d\u540d\u50a8\u5b58\u70b9\u7684 id\u3002";
+    t[499] = "无法取得已命名储存点的 id。";
     t[500] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[501] = "\u4e0d\u80fd\u5728\u4e8b\u7269\u4ea4\u6613\u8fc7\u7a0b\u4e2d\u6539\u53d8\u4e8b\u7269\u4ea4\u6613\u552f\u8bfb\u5c5e\u6027\u3002";
+    t[501] = "不能在事物交易过程中改变事物交易唯读属性。";
     t[502] = "The server does not support SSL.";
-    t[503] = "\u670d\u52a1\u5668\u4e0d\u652f\u63f4 SSL \u8fde\u7ebf\u3002";
+    t[503] = "服务器不支援 SSL 连线。";
     t[510] = "A connection could not be made using the requested protocol {0}.";
-    t[511] = "\u65e0\u6cd5\u4ee5\u8981\u6c42\u7684\u901a\u8baf\u534f\u5b9a {0} \u5efa\u7acb\u8fde\u7ebf\u3002";
+    t[511] = "无法以要求的通讯协定 {0} 建立连线。";
     t[512] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[513] = "\u4e0d\u652f\u63f4 {0} \u9a8c\u8bc1\u7c7b\u578b\u3002\u8bf7\u6838\u5bf9\u60a8\u5df2\u7ecf\u7ec4\u6001 pg_hba.conf \u6587\u4ef6\u5305\u542b\u5ba2\u6237\u7aef\u7684IP\u4f4d\u5740\u6216\u7f51\u8def\u533a\u6bb5\uff0c\u4ee5\u53ca\u9a71\u52a8\u7a0b\u5e8f\u6240\u652f\u63f4\u7684\u9a8c\u8bc1\u67b6\u6784\u6a21\u5f0f\u5df2\u88ab\u652f\u63f4\u3002";
+    t[513] = "不支援 {0} 验证类型。请核对您已经组态 pg_hba.conf 文件包含客户端的IP位址或网路区段，以及驱动程序所支援的验证架构模式已被支援。";
     t[514] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[515] = "\u4e0d\u6b63\u786e\u7684\u51fd\u5f0f\u6216\u7a0b\u5e8f escape \u8bed\u6cd5\u4e8e {0}\u3002";
+    t[515] = "不正确的函式或程序 escape 语法于 {0}。";
     t[516] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[517] = "\u8fd9\u670d\u52a1\u5668\u7684 DateStyle \u53c2\u6570\u88ab\u66f4\u6539\u6210 {0}\uff0cJDBC \u9a71\u52a8\u7a0b\u5e8f\u8bf7\u6c42\u9700\u8981 DateStyle \u4ee5 ISO \u5f00\u5934\u4ee5\u6b63\u786e\u5de5\u4f5c\u3002";
+    t[517] = "这服务器的 DateStyle 参数被更改成 {0}，JDBC 驱动程序请求需要 DateStyle 以 ISO 开头以正确工作。";
     t[518] = "No results were returned by the query.";
-    t[519] = "\u67e5\u8be2\u6ca1\u6709\u4f20\u56de\u4efb\u4f55\u7ed3\u679c\u3002";
+    t[519] = "查询没有传回任何结果。";
     t[520] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[521] = "\u4f4d\u7f6e\uff1a\u6587\u4ef6\uff1a{0}\uff0c\u5e38\u5f0f\uff1a{1}\uff0c\u884c\uff1a{2}";
+    t[521] = "位置：文件：{0}，常式：{1}，行：{2}";
     t[526] = "Hint: {0}";
-    t[527] = "\u5efa\u8bae\uff1a{0}";
+    t[527] = "建议：{0}";
     t[528] = "A CallableStatement was executed with nothing returned.";
-    t[529] = "\u4e00\u4e2a CallableStatement \u6267\u884c\u51fd\u5f0f\u540e\u6ca1\u6709\u4f20\u56de\u503c\u3002";
+    t[529] = "一个 CallableStatement 执行函式后没有传回值。";
     t[530] = "Unknown ResultSet holdability setting: {0}.";
-    t[531] = "\u672a\u77e5\u7684 ResultSet \u53ef\u9002\u7528\u7684\u8bbe\u7f6e\uff1a{0}\u3002";
+    t[531] = "未知的 ResultSet 可适用的设置：{0}。";
     t[540] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[541] = "\u4e0d\u80fd\u5728\u4e8b\u52a1\u4ea4\u6613\u8fc7\u7a0b\u4e2d\u6539\u53d8\u4e8b\u7269\u4ea4\u6613\u9694\u7edd\u7b49\u7ea7\u3002";
+    t[541] = "不能在事务交易过程中改变事物交易隔绝等级。";
     t[544] = "The fastpath function {0} is unknown.";
-    t[545] = "\u4e0d\u660e\u7684 fastpath \u51fd\u5f0f {0}\u3002";
+    t[545] = "不明的 fastpath 函式 {0}。";
     t[546] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[547] = "\u5728 PreparedStatement \u4e0a\u4e0d\u80fd\u4f7f\u7528\u83b7\u53d6\u67e5\u8be2\u5b57\u7b26\u7684\u67e5\u8be2\u65b9\u6cd5\u3002";
+    t[547] = "在 PreparedStatement 上不能使用获取查询字符的查询方法。";
     t[556] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[557] = "\u64cd\u4f5c\u8981\u6c42\u53ef\u5377\u52a8\u7684 ResultSet\uff0c\u4f46\u6b64 ResultSet \u662f FORWARD_ONLY\u3002";
+    t[557] = "操作要求可卷动的 ResultSet，但此 ResultSet 是 FORWARD_ONLY。";
     t[564] = "Unknown Types value.";
-    t[565] = "\u4e0d\u660e\u7684\u7c7b\u578b\u503c\u3002";
+    t[565] = "不明的类型值。";
     t[570] = "Large Objects may not be used in auto-commit mode.";
-    t[571] = "\u5927\u578b\u5bf9\u8c61\u65e0\u6cd5\u88ab\u4f7f\u7528\u5728\u81ea\u52a8\u786e\u8ba4\u4e8b\u7269\u4ea4\u6613\u6a21\u5f0f\u3002";
+    t[571] = "大型对象无法被使用在自动确认事物交易模式。";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_TW.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_TW.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_TW.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/messages_zh_TW.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,233 +5,233 @@
   static {
     java.lang.String[] t = new java.lang.String[578];
     t[0] = "";
-    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.3\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-06-05 10:57+0300\nPO-Revision-Date: 2008-01-21 16:50+0800\nLast-Translator: \u90ed\u671d\u76ca(ChaoYi, Kuo) <Kuo.ChaoYi@gmail.com>\nLanguage-Team: The PostgreSQL Development Team <Kuo.ChaoYi@gmail.com>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Chinese\nX-Poedit-Country: TAIWAN\nX-Poedit-SourceCharset: utf-8\n";
+    t[1] = "Project-Id-Version: PostgreSQL JDBC Driver 8.3\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2008-01-21 16:50+0800\nLast-Translator: 郭朝益(ChaoYi, Kuo) <Kuo.ChaoYi@gmail.com>\nLanguage-Team: The PostgreSQL Development Team <Kuo.ChaoYi@gmail.com>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-Language: Chinese\nX-Poedit-Country: TAIWAN\nX-Poedit-SourceCharset: utf-8\n";
     t[6] = "Cannot call cancelRowUpdates() when on the insert row.";
-    t[7] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u8cc7\u6599\u5217\u4e0a\u547c\u53eb cancelRowUpdates()\u3002";
+    t[7] = "不能在新增的資料列上呼叫 cancelRowUpdates()。";
     t[8] = "The server requested password-based authentication, but no password was provided.";
-    t[9] = "\u4f3a\u670d\u5668\u8981\u6c42\u4f7f\u7528\u5bc6\u78bc\u9a57\u8b49\uff0c\u4f46\u662f\u5bc6\u78bc\u4e26\u672a\u63d0\u4f9b\u3002";
+    t[9] = "伺服器要求使用密碼驗證，但是密碼並未提供。";
     t[12] = "Detail: {0}";
-    t[13] = "\u8a73\u7d30\uff1a{0}";
+    t[13] = "詳細：{0}";
     t[16] = "Can''t refresh the insert row.";
-    t[17] = "\u7121\u6cd5\u91cd\u8b80\u65b0\u589e\u7684\u8cc7\u6599\u5217\u3002";
+    t[17] = "無法重讀新增的資料列。";
     t[18] = "Connection has been closed.";
-    t[19] = "Connection \u5df2\u7d93\u88ab\u95dc\u9589\u3002";
+    t[19] = "Connection 已經被關閉。";
     t[24] = "Bad value for type {0} : {1}";
-    t[25] = "\u4e0d\u826f\u7684\u578b\u5225\u503c {0} : {1}";
+    t[25] = "不良的型別值 {0} : {1}";
     t[34] = "Failed to initialize LargeObject API";
-    t[35] = "\u521d\u59cb\u5316 LargeObject API \u5931\u6557";
+    t[35] = "初始化 LargeObject API 失敗";
     t[36] = "Truncation of large objects is only implemented in 8.3 and later servers.";
-    t[37] = "\u5927\u578b\u7269\u4ef6\u7684\u622a\u65b7(Truncation)\u50c5\u88ab\u5be6\u4f5c\u57f7\u884c\u5728 8.3 \u548c\u5f8c\u4f86\u7684\u4f3a\u670d\u5668\u3002";
+    t[37] = "大型物件的截斷(Truncation)僅被實作執行在 8.3 和後來的伺服器。";
     t[40] = "Cannot retrieve the name of an unnamed savepoint.";
-    t[41] = "\u7121\u6cd5\u53d6\u5f97\u672a\u547d\u540d\u5132\u5b58\u9ede(Savepoint)\u7684\u540d\u7a31\u3002";
+    t[41] = "無法取得未命名儲存點(Savepoint)的名稱。";
     t[46] = "An error occurred while setting up the SSL connection.";
-    t[47] = "\u9032\u884c SSL \u9023\u7dda\u6642\u767c\u751f\u932f\u8aa4\u3002";
+    t[47] = "進行 SSL 連線時發生錯誤。";
     t[50] = "suspend/resume not implemented";
-    t[51] = "\u66ab\u505c(suspend)/\u518d\u7e7c\u7e8c(resume)\u5c1a\u672a\u88ab\u5be6\u4f5c\u3002";
+    t[51] = "暫停(suspend)/再繼續(resume)尚未被實作。";
     t[60] = "{0} function takes one and only one argument.";
-    t[61] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e00\u500b\u4e14\u50c5\u6709\u4e00\u500b\u5f15\u6578\u3002";
+    t[61] = "{0} 函式取得一個且僅有一個引數。";
     t[62] = "Conversion to type {0} failed: {1}.";
-    t[63] = "\u8f49\u63db\u578b\u5225 {0} \u5931\u6557\uff1a{1}\u3002";
+    t[63] = "轉換型別 {0} 失敗：{1}。";
     t[66] = "Conversion of money failed.";
-    t[67] = "money \u8f49\u63db\u5931\u6557\u3002";
+    t[67] = "money 轉換失敗。";
     t[70] = "A result was returned when none was expected.";
-    t[71] = "\u50b3\u56de\u9810\u671f\u4e4b\u5916\u7684\u7d50\u679c\u3002";
+    t[71] = "傳回預期之外的結果。";
     t[80] = "This PooledConnection has already been closed.";
-    t[81] = "\u9019\u500b PooledConnection \u5df2\u7d93\u88ab\u95dc\u9589\u3002";
+    t[81] = "這個 PooledConnection 已經被關閉。";
     t[84] = "Multiple ResultSets were returned by the query.";
-    t[85] = "\u67e5\u8a62\u50b3\u56de\u591a\u500b ResultSet\u3002";
+    t[85] = "查詢傳回多個 ResultSet。";
     t[90] = "Not on the insert row.";
-    t[91] = "\u4e0d\u5728\u65b0\u589e\u7684\u8cc7\u6599\u5217\u4e0a\u3002";
+    t[91] = "不在新增的資料列上。";
     t[94] = "An unexpected result was returned by a query.";
-    t[95] = "\u50b3\u56de\u975e\u9810\u671f\u7684\u67e5\u8a62\u7d50\u679c\u3002";
+    t[95] = "傳回非預期的查詢結果。";
     t[102] = "Internal Query: {0}";
-    t[103] = "\u5167\u90e8\u67e5\u8a62\uff1a{0}";
+    t[103] = "內部查詢：{0}";
     t[106] = "The array index is out of range: {0}";
-    t[107] = "\u9663\u5217\u7d22\u5f15\u8d85\u904e\u8a31\u53ef\u7bc4\u570d\uff1a{0}";
+    t[107] = "陣列索引超過許可範圍：{0}";
     t[112] = "Connection attempt timed out.";
-    t[113] = "Connection \u5617\u8a66\u903e\u6642\u3002";
+    t[113] = "Connection 嘗試逾時。";
     t[114] = "Unable to find name datatype in the system catalogs.";
-    t[115] = "\u5728\u7cfb\u7d71 catalog \u4e2d\u627e\u4e0d\u5230\u540d\u7a31\u8cc7\u6599\u985e\u578b(datatype)\u3002";
+    t[115] = "在系統 catalog 中找不到名稱資料類型(datatype)。";
     t[116] = "Something unusual has occurred to cause the driver to fail. Please report this exception.";
-    t[117] = "\u4e0d\u660e\u7684\u539f\u56e0\u5c0e\u81f4\u9a45\u52d5\u7a0b\u5f0f\u9020\u6210\u5931\u6557\uff0c\u8acb\u56de\u5831\u9019\u500b\u4f8b\u5916\u3002";
+    t[117] = "不明的原因導致驅動程式造成失敗，請回報這個例外。";
     t[120] = "The array index is out of range: {0}, number of elements: {1}.";
-    t[121] = "\u9663\u5217\u7d22\u5f15\u8d85\u904e\u8a31\u53ef\u7bc4\u570d\uff1a{0}\uff0c\u5143\u7d20\u6578\u91cf\uff1a{1}\u3002";
+    t[121] = "陣列索引超過許可範圍：{0}，元素數量：{1}。";
     t[138] = "Invalid flags {0}";
-    t[139] = "\u7121\u6548\u7684\u65d7\u6a19 {0}";
+    t[139] = "無效的旗標 {0}";
     t[146] = "Unexpected error writing large object to database.";
-    t[147] = "\u5c07\u5927\u578b\u7269\u4ef6(large object)\u5beb\u5165\u8cc7\u6599\u5eab\u6642\u767c\u751f\u4e0d\u660e\u932f\u8aa4\u3002";
+    t[147] = "將大型物件(large object)寫入資料庫時發生不明錯誤。";
     t[162] = "Query timeout must be a value greater than or equals to 0.";
-    t[163] = "\u67e5\u8a62\u903e\u6642\u7b49\u5019\u6642\u9593\u5fc5\u9808\u5927\u65bc\u6216\u7b49\u65bc 0\u3002";
+    t[163] = "查詢逾時等候時間必須大於或等於 0。";
     t[170] = "Unknown type {0}.";
-    t[171] = "\u4e0d\u660e\u7684\u578b\u5225 {0}";
+    t[171] = "不明的型別 {0}";
     t[174] = "The server''s standard_conforming_strings parameter was reported as {0}. The JDBC driver expected on or off.";
-    t[175] = "\u9019\u4f3a\u670d\u5668\u7684 standard_conforming_strings \u53c3\u6578\u5df2\u56de\u5831\u70ba {0}\uff0cJDBC \u9a45\u52d5\u7a0b\u5f0f\u5df2\u9810\u671f\u958b\u555f\u6216\u662f\u95dc\u9589\u3002";
+    t[175] = "這伺服器的 standard_conforming_strings 參數已回報為 {0}，JDBC 驅動程式已預期開啟或是關閉。";
     t[176] = "Invalid character data was found.  This is most likely caused by stored data containing characters that are invalid for the character set the database was created in.  The most common example of this is storing 8bit data in a SQL_ASCII database.";
-    t[177] = "\u767c\u73fe\u4e0d\u5408\u6cd5\u7684\u5b57\u5143\uff0c\u53ef\u80fd\u7684\u539f\u56e0\u662f\u6b32\u5132\u5b58\u7684\u8cc7\u6599\u4e2d\u5305\u542b\u8cc7\u6599\u5eab\u7684\u5b57\u5143\u96c6\u4e0d\u652f\u63f4\u7684\u5b57\u78bc\uff0c\u5176\u4e2d\u6700\u5e38\u898b\u4f8b\u5b50\u7684\u5c31\u662f\u5c07 8 \u4f4d\u5143\u8cc7\u6599\u5b58\u5165\u4f7f\u7528 SQL_ASCII \u7de8\u78bc\u7684\u8cc7\u6599\u5eab\u4e2d\u3002";
+    t[177] = "發現不合法的字元，可能的原因是欲儲存的資料中包含資料庫的字元集不支援的字碼，其中最常見例子的就是將 8 位元資料存入使用 SQL_ASCII 編碼的資料庫中。";
     t[178] = "The column index is out of range: {0}, number of columns: {1}.";
-    t[179] = "\u6b04\u4f4d\u7d22\u5f15\u8d85\u904e\u8a31\u53ef\u7bc4\u570d\uff1a{0}\uff0c\u6b04\u4f4d\u6578\uff1a{1}\u3002";
+    t[179] = "欄位索引超過許可範圍：{0}，欄位數：{1}。";
     t[180] = "The connection attempt failed.";
-    t[181] = "\u5617\u8a66\u9023\u7dda\u5df2\u5931\u6557\u3002";
+    t[181] = "嘗試連線已失敗。";
     t[182] = "No value specified for parameter {0}.";
-    t[183] = "\u672a\u8a2d\u5b9a\u53c3\u6578\u503c {0} \u7684\u5167\u5bb9\u3002";
+    t[183] = "未設定參數值 {0} 的內容。";
     t[190] = "Provided Reader failed.";
-    t[191] = "\u63d0\u4f9b\u7684 Reader \u5df2\u5931\u6557\u3002";
+    t[191] = "提供的 Reader 已失敗。";
     t[194] = "Unsupported value for stringtype parameter: {0}";
-    t[195] = "\u5b57\u4e32\u578b\u5225\u53c3\u6578\u503c\u672a\u88ab\u652f\u6301\uff1a{0}";
+    t[195] = "字串型別參數值未被支持：{0}";
     t[198] = "A CallableStatement was declared, but no call to registerOutParameter(1, <some type>) was made.";
-    t[199] = "\u5df2\u7d93\u5ba3\u544a CallableStatement \u51fd\u5f0f\uff0c\u4f46\u662f\u5c1a\u672a\u547c\u53eb registerOutParameter (1, <some_type>) \u3002";
+    t[199] = "已經宣告 CallableStatement 函式，但是尚未呼叫 registerOutParameter (1, <some_type>) 。";
     t[204] = "Currently positioned before the start of the ResultSet.  You cannot call deleteRow() here.";
-    t[205] = "\u4e0d\u80fd\u5728 ResultSet \u7684\u7b2c\u4e00\u7b46\u8cc7\u6599\u4e4b\u524d\u547c\u53eb deleteRow()\u3002";
+    t[205] = "不能在 ResultSet 的第一筆資料之前呼叫 deleteRow()。";
     t[214] = "The maximum field size must be a value greater than or equal to 0.";
-    t[215] = "\u6700\u5927\u6b04\u4f4d\u5bb9\u91cf\u5fc5\u9808\u5927\u65bc\u6216\u7b49\u65bc 0\u3002";
+    t[215] = "最大欄位容量必須大於或等於 0。";
     t[216] = "Fetch size must be a value greater to or equal to 0.";
-    t[217] = "\u8cc7\u6599\u8b80\u53d6\u7b46\u6578(fetch size)\u5fc5\u9808\u5927\u65bc\u6216\u7b49\u65bc 0\u3002";
+    t[217] = "資料讀取筆數(fetch size)必須大於或等於 0。";
     t[220] = "PostgreSQL LOBs can only index to: {0}";
-    t[221] = "PostgreSQL LOBs \u50c5\u80fd\u7d22\u5f15\u5230\uff1a{0}";
+    t[221] = "PostgreSQL LOBs 僅能索引到：{0}";
     t[224] = "The JVM claims not to support the encoding: {0}";
-    t[225] = "JVM \u8072\u660e\u4e26\u4e0d\u652f\u63f4\u7de8\u78bc\uff1a{0} \u3002";
+    t[225] = "JVM 聲明並不支援編碼：{0} 。";
     t[226] = "Interval {0} not yet implemented";
-    t[227] = "\u9694\u7d55 {0} \u5c1a\u672a\u88ab\u5be6\u4f5c\u3002";
+    t[227] = "隔絕 {0} 尚未被實作。";
     t[238] = "Fastpath call {0} - No result was returned and we expected an integer.";
-    t[239] = "Fastpath \u547c\u53eb {0} - \u6c92\u6709\u50b3\u56de\u503c\uff0c\u4e14\u61c9\u8a72\u50b3\u56de\u4e00\u500b\u6574\u6578\u3002";
+    t[239] = "Fastpath 呼叫 {0} - 沒有傳回值，且應該傳回一個整數。";
     t[246] = "ResultSets with concurrency CONCUR_READ_ONLY cannot be updated.";
-    t[247] = "ResultSets \u8207\u4e26\u767c\u540c\u4f5c(Concurrency) CONCUR_READ_ONLY \u4e0d\u80fd\u88ab\u66f4\u65b0\u3002";
+    t[247] = "ResultSets 與並發同作(Concurrency) CONCUR_READ_ONLY 不能被更新。";
     t[250] = "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' to declare one.";
-    t[251] = "\u9019\u500b statement \u672a\u5ba3\u544a OUT \u53c3\u6578\uff0c\u4f7f\u7528 '{' ?= call ... '}' \u5ba3\u544a\u4e00\u500b\u3002";
+    t[251] = "這個 statement 未宣告 OUT 參數，使用 '{' ?= call ... '}' 宣告一個。";
     t[256] = "Cannot reference a savepoint after it has been released.";
-    t[257] = "\u7121\u6cd5\u53c3\u7167\u5df2\u7d93\u88ab\u91cb\u653e\u7684\u5132\u5b58\u9ede\u3002";
+    t[257] = "無法參照已經被釋放的儲存點。";
     t[260] = "Unsupported Types value: {0}";
-    t[261] = "\u672a\u88ab\u652f\u6301\u7684\u578b\u5225\u503c\uff1a{0}";
+    t[261] = "未被支持的型別值：{0}";
     t[266] = "Protocol error.  Session setup failed.";
-    t[267] = "\u901a\u8a0a\u5354\u5b9a\u932f\u8aa4\uff0cSession \u521d\u59cb\u5316\u5931\u6557\u3002";
+    t[267] = "通訊協定錯誤，Session 初始化失敗。";
     t[274] = "Currently positioned after the end of the ResultSet.  You cannot call deleteRow() here.";
-    t[275] = "\u4e0d\u80fd\u5728 ResultSet \u7684\u6700\u5f8c\u4e00\u7b46\u8cc7\u6599\u4e4b\u5f8c\u547c\u53eb deleteRow()\u3002";
+    t[275] = "不能在 ResultSet 的最後一筆資料之後呼叫 deleteRow()。";
     t[278] = "Internal Position: {0}";
-    t[279] = "\u5167\u90e8\u4f4d\u7f6e\uff1a{0}";
+    t[279] = "內部位置：{0}";
     t[280] = "Zero bytes may not occur in identifiers.";
-    t[281] = "\u5728\u6a19\u8b58\u8b58\u5225\u7b26\u4e2d\u4e0d\u5b58\u5728\u96f6\u4f4d\u5143\u7d44\u3002";
+    t[281] = "在標識識別符中不存在零位元組。";
     t[288] = "{0} function doesn''t take any argument.";
-    t[289] = "{0} \u51fd\u5f0f\u7121\u6cd5\u53d6\u5f97\u4efb\u4f55\u7684\u5f15\u6578\u3002";
+    t[289] = "{0} 函式無法取得任何的引數。";
     t[300] = "This statement has been closed.";
-    t[301] = "\u9019\u500b statement \u5df2\u7d93\u88ab\u95dc\u9589\u3002";
+    t[301] = "這個 statement 已經被關閉。";
     t[318] = "Cannot establish a savepoint in auto-commit mode.";
-    t[319] = "\u5728\u81ea\u52d5\u78ba\u8a8d\u4e8b\u7269\u4ea4\u6613\u6a21\u5f0f\u7121\u6cd5\u5efa\u7acb\u5132\u5b58\u9ede(Savepoint)\u3002";
+    t[319] = "在自動確認事物交易模式無法建立儲存點(Savepoint)。";
     t[320] = "Position: {0}";
-    t[321] = "\u4f4d\u7f6e\uff1a{0}";
+    t[321] = "位置：{0}";
     t[322] = "ResultSet is not updateable.  The query that generated this result set must select only one table, and must select all primary keys from that table. See the JDBC 2.1 API Specification, section 5.6 for more details.";
-    t[323] = "\u4e0d\u53ef\u66f4\u65b0\u7684 ResultSet\u3002\u7528\u4f86\u7522\u751f\u9019\u500b ResultSet \u7684 SQL \u547d\u4ee4\u53ea\u80fd\u64cd\u4f5c\u4e00\u500b\u8cc7\u6599\u8868\uff0c\u4e26\u4e14\u5fc5\u9700\u9078\u64c7\u6240\u6709\u4e3b\u9375\u6b04\u4f4d\uff0c\u8a73\u7d30\u8acb\u53c3\u95b1 JDBC 2.1 API \u898f\u683c\u66f8 5.6 \u7bc0\u3002";
+    t[323] = "不可更新的 ResultSet。用來產生這個 ResultSet 的 SQL 命令只能操作一個資料表，並且必需選擇所有主鍵欄位，詳細請參閱 JDBC 2.1 API 規格書 5.6 節。";
     t[330] = "This ResultSet is closed.";
-    t[331] = "\u9019\u500b ResultSet \u5df2\u7d93\u88ab\u95dc\u9589\u3002";
+    t[331] = "這個 ResultSet 已經被關閉。";
     t[338] = "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was made.";
-    t[339] = "\u5df2\u8a3b\u518a\u53c3\u6578\u578b\u5225 {0}\uff0c\u4f46\u662f\u53c8\u547c\u53eb\u4e86get{1}(sqltype={2})\u3002";
+    t[339] = "已註冊參數型別 {0}，但是又呼叫了get{1}(sqltype={2})。";
     t[342] = "Transaction isolation level {0} not supported.";
-    t[343] = "\u4e0d\u652f\u63f4\u4ea4\u6613\u9694\u7d55\u7b49\u7d1a {0} \u3002";
+    t[343] = "不支援交易隔絕等級 {0} 。";
     t[344] = "Statement has been closed.";
-    t[345] = "Sstatement \u5df2\u7d93\u88ab\u95dc\u9589\u3002";
+    t[345] = "Sstatement 已經被關閉。";
     t[352] = "Server SQLState: {0}";
-    t[353] = "\u4f3a\u670d\u5668 SQLState\uff1a{0}";
+    t[353] = "伺服器 SQLState：{0}";
     t[354] = "No primary key found for table {0}.";
-    t[355] = "{0} \u8cc7\u6599\u8868\u4e2d\u672a\u627e\u5230\u4e3b\u9375(Primary key)\u3002";
+    t[355] = "{0} 資料表中未找到主鍵(Primary key)。";
     t[362] = "Cannot convert an instance of {0} to type {1}";
-    t[363] = "\u7121\u6cd5\u8f49\u63db {0} \u5230\u985e\u578b {1} \u7684\u5be6\u4f8b";
+    t[363] = "無法轉換 {0} 到類型 {1} 的實例";
     t[364] = "DataSource has been closed.";
-    t[365] = "DataSource \u5df2\u7d93\u88ab\u95dc\u9589\u3002";
+    t[365] = "DataSource 已經被關閉。";
     t[368] = "The column name {0} was not found in this ResultSet.";
-    t[369] = "ResultSet \u4e2d\u627e\u4e0d\u5230\u6b04\u4f4d\u540d\u7a31 {0}\u3002";
+    t[369] = "ResultSet 中找不到欄位名稱 {0}。";
     t[372] = "ResultSet not positioned properly, perhaps you need to call next.";
-    t[373] = "\u67e5\u8a62\u7d50\u679c\u6307\u6a19\u4f4d\u7f6e\u4e0d\u6b63\u78ba\uff0c\u60a8\u4e5f\u8a31\u9700\u8981\u547c\u53eb ResultSet \u7684 next() \u65b9\u6cd5\u3002";
+    t[373] = "查詢結果指標位置不正確，您也許需要呼叫 ResultSet 的 next() 方法。";
     t[378] = "Cannot update the ResultSet because it is either before the start or after the end of the results.";
-    t[379] = "\u7121\u6cd5\u66f4\u65b0 ResultSet\uff0c\u53ef\u80fd\u5728\u7b2c\u4e00\u7b46\u8cc7\u6599\u4e4b\u524d\u6216\u6700\u672a\u7b46\u8cc7\u6599\u4e4b\u5f8c\u3002";
+    t[379] = "無法更新 ResultSet，可能在第一筆資料之前或最未筆資料之後。";
     t[380] = "Method {0} is not yet implemented.";
-    t[381] = "\u9019\u500b {0} \u65b9\u6cd5\u5c1a\u672a\u88ab\u5be6\u4f5c\u3002";
+    t[381] = "這個 {0} 方法尚未被實作。";
     t[382] = "{0} function takes two or three arguments.";
-    t[383] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e8c\u500b\u6216\u4e09\u500b\u5f15\u6578\u3002";
+    t[383] = "{0} 函式取得二個或三個引數。";
     t[384] = "The JVM claims not to support the {0} encoding.";
-    t[385] = "JVM \u8072\u660e\u4e26\u4e0d\u652f\u63f4 {0} \u7de8\u78bc\u3002";
+    t[385] = "JVM 聲明並不支援 {0} 編碼。";
     t[396] = "Unknown Response Type {0}.";
-    t[397] = "\u4e0d\u660e\u7684\u56de\u61c9\u985e\u578b {0}\u3002";
+    t[397] = "不明的回應類型 {0}。";
     t[398] = "The parameter index is out of range: {0}, number of parameters: {1}.";
-    t[399] = "\u53c3\u6578\u7d22\u5f15\u8d85\u51fa\u8a31\u53ef\u7bc4\u570d\uff1a{0}\uff0c\u53c3\u6578\u7e3d\u6578\uff1a{1}\u3002";
+    t[399] = "參數索引超出許可範圍：{0}，參數總數：{1}。";
     t[400] = "Where: {0}";
-    t[401] = "\u5728\u4f4d\u7f6e\uff1a{0}";
+    t[401] = "在位置：{0}";
     t[406] = "Cannot call deleteRow() when on the insert row.";
-    t[407] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u8cc7\u6599\u4e0a\u547c\u53eb deleteRow()\u3002";
+    t[407] = "不能在新增的資料上呼叫 deleteRow()。";
     t[414] = "{0} function takes four and only four argument.";
-    t[415] = "{0} \u51fd\u5f0f\u53d6\u5f97\u56db\u500b\u4e14\u50c5\u6709\u56db\u500b\u5f15\u6578\u3002";
+    t[415] = "{0} 函式取得四個且僅有四個引數。";
     t[416] = "Unable to translate data into the desired encoding.";
-    t[417] = "\u7121\u6cd5\u5c07\u8cc7\u6599\u8f49\u6210\u76ee\u6a19\u7de8\u78bc\u3002";
+    t[417] = "無法將資料轉成目標編碼。";
     t[424] = "Can''t use relative move methods while on the insert row.";
-    t[425] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u8cc7\u6599\u5217\u4e0a\u4f7f\u7528\u76f8\u5c0d\u4f4d\u7f6e move \u65b9\u6cd5\u3002";
+    t[425] = "不能在新增的資料列上使用相對位置 move 方法。";
     t[434] = "Invalid stream length {0}.";
-    t[435] = "\u7121\u6548\u7684\u4e32\u6d41\u9577\u5ea6 {0}.";
+    t[435] = "無效的串流長度 {0}.";
     t[436] = "The driver currently does not support COPY operations.";
-    t[437] = "\u9a45\u52d5\u7a0b\u5f0f\u76ee\u524d\u4e0d\u652f\u63f4 COPY \u64cd\u4f5c\u3002";
+    t[437] = "驅動程式目前不支援 COPY 操作。";
     t[440] = "Maximum number of rows must be a value grater than or equal to 0.";
-    t[441] = "\u6700\u5927\u8cc7\u6599\u8b80\u53d6\u7b46\u6578\u5fc5\u9808\u5927\u65bc\u6216\u7b49\u65bc 0\u3002";
+    t[441] = "最大資料讀取筆數必須大於或等於 0。";
     t[446] = "Failed to create object for: {0}.";
-    t[447] = "\u70ba {0} \u5efa\u7acb\u7269\u4ef6\u5931\u6557\u3002";
+    t[447] = "為 {0} 建立物件失敗。";
     t[448] = "{0} function takes three and only three arguments.";
-    t[449] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e09\u500b\u4e14\u50c5\u6709\u4e09\u500b\u5f15\u6578\u3002";
+    t[449] = "{0} 函式取得三個且僅有三個引數。";
     t[450] = "Conversion of interval failed";
-    t[451] = "\u9694\u7d55(Interval)\u8f49\u63db\u5931\u6557\u3002";
+    t[451] = "隔絕(Interval)轉換失敗。";
     t[452] = "Cannot tell if path is open or closed: {0}.";
-    t[453] = "\u7121\u6cd5\u5f97\u77e5 path \u662f\u958b\u555f\u6216\u95dc\u9589\uff1a{0}\u3002";
+    t[453] = "無法得知 path 是開啟或關閉：{0}。";
     t[460] = "Provided InputStream failed.";
-    t[461] = "\u63d0\u4f9b\u7684 InputStream \u5df2\u5931\u6557\u3002";
+    t[461] = "提供的 InputStream 已失敗。";
     t[462] = "Invalid fetch direction constant: {0}.";
-    t[463] = "\u7121\u6548\u7684 fetch \u65b9\u5411\u5e38\u6578\uff1a{0}\u3002";
+    t[463] = "無效的 fetch 方向常數：{0}。";
     t[472] = "Invalid protocol state requested. Attempted transaction interleaving is not supported. xid={0}, currentXid={1}, state={2}, flags={3}";
-    t[473] = "\u4e8b\u7269\u4ea4\u6613\u9694\u7d55(Transaction interleaving)\u672a\u88ab\u5be6\u4f5c\u3002xid={0}, currentXid={1}, state={2}, flags={3}";
+    t[473] = "事物交易隔絕(Transaction interleaving)未被實作。xid={0}, currentXid={1}, state={2}, flags={3}";
     t[474] = "{0} function takes two and only two arguments.";
-    t[475] = "{0} \u51fd\u5f0f\u53d6\u5f97\u4e8c\u500b\u4e14\u50c5\u6709\u4e8c\u500b\u5f15\u6578\u3002";
+    t[475] = "{0} 函式取得二個且僅有二個引數。";
     t[476] = "There are no rows in this ResultSet.";
-    t[477] = "ResultSet \u4e2d\u627e\u4e0d\u5230\u8cc7\u6599\u5217\u3002";
+    t[477] = "ResultSet 中找不到資料列。";
     t[478] = "Zero bytes may not occur in string parameters.";
-    t[479] = "\u5b57\u4e32\u53c3\u6578\u4e0d\u80fd\u6709 0 \u500b\u4f4d\u5143\u7d44\u3002";
+    t[479] = "字串參數不能有 0 個位元組。";
     t[480] = "Cannot call updateRow() when on the insert row.";
-    t[481] = "\u4e0d\u80fd\u5728\u65b0\u589e\u7684\u8cc7\u6599\u5217\u4e0a\u547c\u53eb deleteRow()\u3002";
+    t[481] = "不能在新增的資料列上呼叫 deleteRow()。";
     t[482] = "Connection has been closed automatically because a new connection was opened for the same PooledConnection or the PooledConnection has been closed.";
-    t[483] = "Connection \u5df2\u81ea\u52d5\u7d50\u675f\uff0c\u56e0\u70ba\u4e00\u500b\u65b0\u7684  PooledConnection \u9023\u7dda\u88ab\u958b\u555f\u6216\u8005\u6216 PooledConnection \u5df2\u88ab\u95dc\u9589\u3002";
+    t[483] = "Connection 已自動結束，因為一個新的  PooledConnection 連線被開啟或者或 PooledConnection 已被關閉。";
     t[488] = "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.";
-    t[489] = "\u4e00\u500b CallableStatement \u57f7\u884c\u51fd\u5f0f\u5f8c\u8f38\u51fa\u7684\u53c3\u6578\u578b\u5225\u70ba {1} \u503c\u70ba {0}\uff0c\u4f46\u662f\u5df2\u8a3b\u518a\u7684\u578b\u5225\u662f {2}\u3002";
+    t[489] = "一個 CallableStatement 執行函式後輸出的參數型別為 {1} 值為 {0}，但是已註冊的型別是 {2}。";
     t[494] = "Cannot cast an instance of {0} to type {1}";
-    t[495] = "\u4e0d\u80fd\u8f49\u63db\u4e00\u500b {0} \u5be6\u4f8b\u5230\u578b\u5225 {1}";
+    t[495] = "不能轉換一個 {0} 實例到型別 {1}";
     t[498] = "Cannot retrieve the id of a named savepoint.";
-    t[499] = "\u7121\u6cd5\u53d6\u5f97\u5df2\u547d\u540d\u5132\u5b58\u9ede\u7684 id\u3002";
+    t[499] = "無法取得已命名儲存點的 id。";
     t[500] = "Cannot change transaction read-only property in the middle of a transaction.";
-    t[501] = "\u4e0d\u80fd\u5728\u4e8b\u7269\u4ea4\u6613\u904e\u7a0b\u4e2d\u6539\u8b8a\u4e8b\u7269\u4ea4\u6613\u552f\u8b80\u5c6c\u6027\u3002";
+    t[501] = "不能在事物交易過程中改變事物交易唯讀屬性。";
     t[502] = "The server does not support SSL.";
-    t[503] = "\u4f3a\u670d\u5668\u4e0d\u652f\u63f4 SSL \u9023\u7dda\u3002";
+    t[503] = "伺服器不支援 SSL 連線。";
     t[510] = "A connection could not be made using the requested protocol {0}.";
-    t[511] = "\u7121\u6cd5\u4ee5\u8981\u6c42\u7684\u901a\u8a0a\u5354\u5b9a {0} \u5efa\u7acb\u9023\u7dda\u3002";
+    t[511] = "無法以要求的通訊協定 {0} 建立連線。";
     t[512] = "The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client''s IP address or subnet, and that it is using an authentication scheme supported by the driver.";
-    t[513] = "\u4e0d\u652f\u63f4 {0} \u9a57\u8b49\u578b\u5225\u3002\u8acb\u6838\u5c0d\u60a8\u5df2\u7d93\u7d44\u614b pg_hba.conf \u6a94\u6848\u5305\u542b\u5ba2\u6236\u7aef\u7684IP\u4f4d\u5740\u6216\u7db2\u8def\u5340\u6bb5\uff0c\u4ee5\u53ca\u9a45\u52d5\u7a0b\u5f0f\u6240\u652f\u63f4\u7684\u9a57\u8b49\u67b6\u69cb\u6a21\u5f0f\u5df2\u88ab\u652f\u63f4\u3002";
+    t[513] = "不支援 {0} 驗證型別。請核對您已經組態 pg_hba.conf 檔案包含客戶端的IP位址或網路區段，以及驅動程式所支援的驗證架構模式已被支援。";
     t[514] = "Malformed function or procedure escape syntax at offset {0}.";
-    t[515] = "\u4e0d\u6b63\u78ba\u7684\u51fd\u5f0f\u6216\u7a0b\u5e8f escape \u8a9e\u6cd5\u65bc {0}\u3002";
+    t[515] = "不正確的函式或程序 escape 語法於 {0}。";
     t[516] = "The server''s DateStyle parameter was changed to {0}. The JDBC driver requires DateStyle to begin with ISO for correct operation.";
-    t[517] = "\u9019\u4f3a\u670d\u5668\u7684 DateStyle \u53c3\u6578\u88ab\u66f4\u6539\u6210 {0}\uff0cJDBC \u9a45\u52d5\u7a0b\u5f0f\u8acb\u6c42\u9700\u8981 DateStyle \u4ee5 ISO \u958b\u982d\u4ee5\u6b63\u78ba\u5de5\u4f5c\u3002";
+    t[517] = "這伺服器的 DateStyle 參數被更改成 {0}，JDBC 驅動程式請求需要 DateStyle 以 ISO 開頭以正確工作。";
     t[518] = "No results were returned by the query.";
-    t[519] = "\u67e5\u8a62\u6c92\u6709\u50b3\u56de\u4efb\u4f55\u7d50\u679c\u3002";
+    t[519] = "查詢沒有傳回任何結果。";
     t[520] = "Location: File: {0}, Routine: {1}, Line: {2}";
-    t[521] = "\u4f4d\u7f6e\uff1a\u6a94\u6848\uff1a{0}\uff0c\u5e38\u5f0f\uff1a{1}\uff0c\u884c\uff1a{2}";
+    t[521] = "位置：檔案：{0}，常式：{1}，行：{2}";
     t[526] = "Hint: {0}";
-    t[527] = "\u5efa\u8b70\uff1a{0}";
+    t[527] = "建議：{0}";
     t[528] = "A CallableStatement was executed with nothing returned.";
-    t[529] = "\u4e00\u500b CallableStatement \u57f7\u884c\u51fd\u5f0f\u5f8c\u6c92\u6709\u50b3\u56de\u503c\u3002";
+    t[529] = "一個 CallableStatement 執行函式後沒有傳回值。";
     t[530] = "Unknown ResultSet holdability setting: {0}.";
-    t[531] = "\u672a\u77e5\u7684 ResultSet \u53ef\u9069\u7528\u7684\u8a2d\u7f6e\uff1a{0}\u3002";
+    t[531] = "未知的 ResultSet 可適用的設置：{0}。";
     t[540] = "Cannot change transaction isolation level in the middle of a transaction.";
-    t[541] = "\u4e0d\u80fd\u5728\u4e8b\u52d9\u4ea4\u6613\u904e\u7a0b\u4e2d\u6539\u8b8a\u4e8b\u7269\u4ea4\u6613\u9694\u7d55\u7b49\u7d1a\u3002";
+    t[541] = "不能在事務交易過程中改變事物交易隔絕等級。";
     t[544] = "The fastpath function {0} is unknown.";
-    t[545] = "\u4e0d\u660e\u7684 fastpath \u51fd\u5f0f {0}\u3002";
+    t[545] = "不明的 fastpath 函式 {0}。";
     t[546] = "Can''t use query methods that take a query string on a PreparedStatement.";
-    t[547] = "\u5728 PreparedStatement \u4e0a\u4e0d\u80fd\u4f7f\u7528\u7372\u53d6\u67e5\u8a62\u5b57\u4e32\u7684\u67e5\u8a62\u65b9\u6cd5\u3002";
+    t[547] = "在 PreparedStatement 上不能使用獲取查詢字串的查詢方法。";
     t[556] = "Operation requires a scrollable ResultSet, but this ResultSet is FORWARD_ONLY.";
-    t[557] = "\u64cd\u4f5c\u8981\u6c42\u53ef\u6372\u52d5\u7684 ResultSet\uff0c\u4f46\u6b64 ResultSet \u662f FORWARD_ONLY\u3002";
+    t[557] = "操作要求可捲動的 ResultSet，但此 ResultSet 是 FORWARD_ONLY。";
     t[564] = "Unknown Types value.";
-    t[565] = "\u4e0d\u660e\u7684\u578b\u5225\u503c\u3002";
+    t[565] = "不明的型別值。";
     t[570] = "Large Objects may not be used in auto-commit mode.";
-    t[571] = "\u5927\u578b\u7269\u4ef6\u7121\u6cd5\u88ab\u4f7f\u7528\u5728\u81ea\u52d5\u78ba\u8a8d\u4e8b\u7269\u4ea4\u6613\u6a21\u5f0f\u3002";
+    t[571] = "大型物件無法被使用在自動確認事物交易模式。";
     table = t;
   }
   public java.lang.Object handleGetObject (java.lang.String msgid) throws java.util.MissingResourceException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/nl.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/nl.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/nl.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/nl.po	2018-08-27 15:38:30.000000000 +0000
@@ -6,7 +6,6 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL JDBC Driver 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2004-10-11 23:55-0700\n"
 "Last-Translator: Arnout Kuiper <ajkuiper@wxs.nl>\n"
 "Language-Team: Dutch <ajkuiper@wxs.nl>\n"
@@ -15,22 +14,22 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -38,37 +37,37 @@
 "Iets ongewoons is opgetreden, wat deze driver doet falen. Rapporteer deze "
 "fout AUB: {0}"
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 #, fuzzy
 msgid "Connection attempt timed out."
 msgstr "De poging om verbinding the maken faalde omdat {0}"
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 #, fuzzy
 msgid "Interrupted while attempting to connect."
 msgstr "Een fout trad op tijdens het ophalen van het authenticatie verzoek."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, fuzzy, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Deze methode is nog niet geimplementeerd"
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -92,6 +91,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -112,7 +116,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr ""
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -168,23 +172,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, fuzzy, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "De kolom index is buiten bereik."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Onbekende Types waarde."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -194,41 +198,41 @@
 "dat de postmaster is opgestart met de -i vlag, welke TCP/IP networking "
 "aanzet."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 #, fuzzy
 msgid "The connection attempt failed."
 msgstr "De poging om verbinding the maken faalde omdat {0}"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 #, fuzzy
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Een fout trad op tijdens het ophalen van het authenticatie verzoek."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, fuzzy, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -240,16 +244,16 @@
 "dat het een authenticatie protocol gebruikt dat door de driver ondersteund "
 "wordt."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr ""
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -257,177 +261,172 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Een I/O fout trad op tijdens het zenden naar de achterkant - {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Een I/O fout trad op tijdens het zenden naar de achterkant - {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, fuzzy, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Onbekend antwoord type {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Een I/O fout trad op tijdens het zenden naar de achterkant - {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
 "requires client_encoding to be UTF8 for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
 "requires DateStyle to begin with ISO for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -486,21 +485,21 @@
 msgid "Unsupported property name: {0}"
 msgstr "Onbekende Types waarde."
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 "Fastpath aanroep {0} - Geen resultaat werd teruggegeven, terwijl we een "
 "integer verwacht hadden."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 "Fastpath aanroep {0} - Geen resultaat werd teruggegeven, terwijl we een "
 "integer verwacht hadden."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -509,14 +508,14 @@
 "Fastpath aanroep {0} - Geen resultaat werd teruggegeven, terwijl we een "
 "integer verwacht hadden."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 "Fastpath aanroep {0} - Geen resultaat werd teruggegeven, terwijl we een "
 "integer verwacht hadden."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -525,7 +524,7 @@
 "Fastpath aanroep {0} - Geen resultaat werd teruggegeven, terwijl we een "
 "integer verwacht hadden."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "De fastpath functie {0} is onbekend."
@@ -592,63 +591,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, fuzzy, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Deze methode is nog niet geimplementeerd"
@@ -667,17 +673,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, fuzzy, java-format
 msgid "The array index is out of range: {0}"
 msgstr "De kolom index is buiten bereik."
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -688,69 +694,69 @@
 "SQL_ASCII database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 #, fuzzy
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "Callable Statements worden op dit moment niet ondersteund."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 #, fuzzy
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr "Callable Statements worden op dit moment niet ondersteund."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
 "type {1} however type {2} was registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Onbekende Types waarde."
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr ""
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -762,125 +768,125 @@
 msgid "No results were returned by the query."
 msgstr "Geen resultaten werden teruggegeven door de query."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, fuzzy, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Kon geen object aanmaken voor  {0} {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "De poging om verbinding the maken faalde omdat {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, java-format
 msgid "Invalid elements {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Kon geen object aanmaken voor  {0} {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr ""
 
@@ -894,46 +900,46 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 msgid "Unable to find keywords in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -942,83 +948,83 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "De kolom index is buiten bereik."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Onbekende Types waarde."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, fuzzy, java-format
 msgid "Unknown type {0}."
 msgstr "Onbekend antwoord type {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, fuzzy, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Onbekende Types waarde."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1034,8 +1040,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr ""
@@ -1047,7 +1053,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr ""
@@ -1087,8 +1093,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr ""
@@ -1102,7 +1108,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1119,68 +1125,68 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, fuzzy, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "De kolom naam {0} is niet gevonden."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
 "the JDBC 2.1 API Specification, section 5.6 for more details."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr ""
@@ -1246,33 +1252,33 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr ""
@@ -1285,32 +1291,32 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Onbekende Types waarde."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Onbekende Types waarde."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 #, fuzzy
 msgid "Failed to initialize LargeObject API"
 msgstr "Kon LargeObject API niet initialiseren"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr ""
 
@@ -1344,34 +1350,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Een fout trad op tijdens het ophalen van het authenticatie verzoek."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1508,129 +1514,129 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 #, fuzzy
 msgid "suspend/resume not implemented"
 msgstr "Deze methode is nog niet geimplementeerd"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
 "supported. xid={0}, currentXid={1}, state={2}, flags={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/pl.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/pl.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/pl.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/pl.po	2018-08-27 15:38:30.000000000 +0000
@@ -10,7 +10,6 @@
 msgstr ""
 "Project-Id-Version: head-pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2005-05-22 03:01+0200\n"
 "Last-Translator: Jarosław Jan Pyszny <jarek@pyszny.net>\n"
 "Language-Team:  <pl@li.org>\n"
@@ -22,56 +21,56 @@
 "Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr "Błąd podczas wczytywania ustawień domyślnych z driverconfig.properties"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
 msgstr "Coś niezwykłego spowodowało pad sterownika. Proszę, zgłoś ten wyjątek."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr ""
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr ""
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Metoda {0}nie jest jeszcze obsługiwana."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -96,6 +95,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -118,7 +122,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr ""
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -175,23 +179,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "Indeks kolumny jest poza zakresem: {0}, liczba kolumn: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Nieznana wartość Types: {0}"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -200,27 +204,27 @@
 "Połączenie odrzucone. Sprawdź, czy prawidłowo ustawiłeś nazwę hosta oraz "
 "port i upewnij się, czy postmaster przyjmuje połączenia TCP/IP."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Próba nawiązania połączenia nie powiodła się."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Serwer nie obsługuje SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Wystąpił błąd podczas ustanawiania połączenia SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
@@ -228,13 +232,13 @@
 "Serwer zażądał uwierzytelnienia opartego na haśle, ale żadne hasło nie "
 "zostało dostarczone."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -246,16 +250,16 @@
 "klienta oraz że użyta metoda uwierzytelnienia jest wspierana przez ten "
 "sterownik."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Błąd protokołu. Nie udało się utworzyć sesji."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -263,177 +267,172 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Wystąpił błąd We/Wy podczas wysyłania do serwera."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Spodziewano się statusu komendy BEGIN, otrzymano {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Nieoczekiwany status komendy: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Wystąpił błąd We/Wy podczas wysyłania do serwera."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Nieznany typ odpowiedzi {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Wystąpił błąd We/Wy podczas wysyłania do serwera."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Nieoczekiwany status komendy: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Sterownik nie obsługuje aktualnie operacji COPY."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
 "requires client_encoding to be UTF8 for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
 "requires DateStyle to begin with ISO for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -495,21 +494,21 @@
 msgid "Unsupported property name: {0}"
 msgstr "Nieznana wartość Types: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 "Wywołanie fastpath {0} - Nie otrzymano żadnego wyniku, a oczekiwano liczby "
 "całkowitej."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 "Wywołanie fastpath {0} - Nie otrzymano żadnego wyniku, a oczekiwano liczby "
 "całkowitej."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -518,14 +517,14 @@
 "Wywołanie fastpath {0} - Nie otrzymano żadnego wyniku, a oczekiwano liczby "
 "całkowitej."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 "Wywołanie fastpath {0} - Nie otrzymano żadnego wyniku, a oczekiwano liczby "
 "całkowitej."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -534,7 +533,7 @@
 "Wywołanie fastpath {0} - Nie otrzymano żadnego wyniku, a oczekiwano liczby "
 "całkowitej."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "Funkcja fastpath {0} jest nieznana."
@@ -602,63 +601,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, fuzzy, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Metoda {0}nie jest jeszcze obsługiwana."
@@ -677,17 +683,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr ""
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Indeks tablicy jest poza zakresem: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "Indeks tablicy jest poza zakresem: {0}, liczba elementów: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -702,41 +708,41 @@
 "podczas tworzenia bazy danych. Najczęstszy przykład to przechowywanie 8-"
 "bitowych znaków w bazie o kodowaniu SQL_ASCII."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
 "type {1} however type {2} was registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -744,27 +750,27 @@
 "Funkcja CallableStatement została zadeklarowana, ale nie wywołano "
 "registerOutParameter (1, <jakiś typ>)."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Nieznana wartość Types: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, fuzzy, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Nieznana wartość Types: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -776,128 +782,128 @@
 msgid "No results were returned by the query."
 msgstr "Zapytanie nie zwróciło żadnych wyników."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Zwrócono wynik zapytania, choć nie był on oczekiwany."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Nie powiodło się utworzenie obiektu dla: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 "Nie jest możliwe załadowanie klasy {0} odpowiedzialnej za typ danych {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Połączenie zostało zamknięte."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Poziom izolacji transakcji {0} nie jest obsługiwany."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 #, fuzzy
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Połączenie zostało zamknięte."
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Rozmiar pobierania musi być wartością dodatnią lub 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, java-format
 msgid "Invalid elements {0}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Nie powiodło się utworzenie obiektu dla: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "Timeout zapytania musi być wartością dodatnią lub 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr ""
 
@@ -911,46 +917,46 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 msgid "Unable to find keywords in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -959,83 +965,83 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "Indeks parametru jest poza zakresem: {0}, liczba parametrów: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Nieznana wartość Types."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Nieznany typ {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Nieznana wartość Types: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1051,8 +1057,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr ""
@@ -1064,7 +1070,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr ""
@@ -1104,8 +1110,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr ""
@@ -1119,7 +1125,7 @@
 msgstr "Nie można wywołać updateRow() na wstawianym rekordzie."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1136,27 +1142,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "Zła wartość dla typu {0}: {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1167,41 +1173,41 @@
 "klucze główne tej tabeli. Zobacz Specyfikację JDBC 2.1 API, rozdział 5.6, by "
 "uzyskać więcej szczegółów."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "Ten ResultSet jest zamknięty."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr "Zła pozycja w ResultSet, może musisz wywołać next."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Poziom izolacji transakcji {0} nie jest obsługiwany."
@@ -1267,33 +1273,33 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "Maksymalna liczba rekordów musi być wartością dodatnią lub 0."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "Timeout zapytania musi być wartością dodatnią lub 0."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "Maksymalny rozmiar pola musi być wartością dodatnią lub 0."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "Zła wartość dla typu {0}: {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Nieznana wartość Types: {0}"
@@ -1306,31 +1312,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Nieznana wartość Types: {0}"
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Nieznana wartość Types: {0}"
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Nie udało się zainicjować LargeObject API"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr ""
 
@@ -1364,34 +1370,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Wystąpił błąd podczas ustanawiania połączenia SSL."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1526,31 +1532,31 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, fuzzy, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1559,97 +1565,97 @@
 "Poziom izolacji transakcji {0} nie jest obsługiwany. xid={0}, "
 "currentXid={1}, state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/pt_BR.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/pt_BR.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/pt_BR.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/pt_BR.po	2018-08-27 15:38:30.000000000 +0000
@@ -8,7 +8,6 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2004-10-31 20:48-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -17,15 +16,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr "Erro ao carregar configurações padrão do driverconfig.properties"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
@@ -36,7 +35,7 @@
 "para a máquina e a porta do servidor de banco de dados que você deseja se "
 "conectar."
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -44,35 +43,35 @@
 "Alguma coisa não usual ocorreu para causar a falha do driver. Por favor "
 "reporte esta exceção."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Tentativa de conexão falhou."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Interrompido ao tentar se conectar."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Método {0} ainda não foi implementado."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -97,6 +96,13 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+"Não foi possível interpretar o contador de atualização na marcação de "
+"comando completo: {0}."
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -119,7 +125,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr "Esperado um EOF do servidor, recebido: {0}"
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr ""
@@ -181,24 +187,24 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr ""
 "O índice da coluna está fora do intervalo: {0}, número de colunas: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Tamanho de dado {0} é inválido."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Tamanho de dado {0} é inválido."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -207,27 +213,27 @@
 "Conexão negada. Verifique se o nome da máquina e a porta estão corretos e se "
 "o postmaster está aceitando conexões TCP/IP."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "A tentativa de conexão falhou."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "O servidor não suporta SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Um erro ocorreu ao estabelecer uma conexão SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
@@ -235,13 +241,13 @@
 "O servidor pediu autenticação baseada em senha, mas nenhuma senha foi "
 "fornecida."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -252,16 +258,16 @@
 "arquivo pg_hba.conf incluindo a subrede ou endereço IP do cliente, e se está "
 "utilizando o esquema de autenticação suportado pelo driver."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Erro de Protocolo. Configuração da sessão falhou."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -269,144 +275,144 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 #, fuzzy
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Interrompido ao tentar se conectar."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr "Não foi possível ligar valores de parâmetro ao comando."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Um erro de E/S ocorreu ao enviar para o processo servidor."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Status do comando BEGIN esperado, recebeu {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Status do comando inesperado: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Um erro de E/S ocorreu ao enviar para o processo servidor."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Tipo de Resposta Desconhecido {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Um erro de E/S ocorreu ao enviar para o processo servidor."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Esperado um EOF do servidor, recebido: {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
@@ -416,22 +422,15 @@
 "especificações de tamanho incorretas ou muito grandes nos parâmetros do "
 "InputStream."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr "Memória insuficiente ao recuperar resultados da consulta."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "O driver atualmente não suporta operações COPY."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-"Não foi possível interpretar o contador de atualização na marcação de "
-"comando completo: {0}."
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -440,7 +439,7 @@
 "O parâmetro do servidor client_encoding foi alterado para {0}. O driver JDBC "
 "requer que o client_encoding seja UNICODE para operação normal."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -449,7 +448,7 @@
 "O parâmetro do servidor DateStyle foi alterado para {0}. O driver JDBC "
 "requer que o DateStyle começe com ISO para operação normal."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -513,21 +512,21 @@
 msgid "Unsupported property name: {0}"
 msgstr "Valor de Types não é suportado: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 "Chamada ao Fastpath {0} - Nenhum resultado foi retornado e nós esperávamos "
 "um inteiro."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 "Chamada ao Fastpath {0} - Nenhum resultado foi retornado e nós esperávamos "
 "um inteiro."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -536,14 +535,14 @@
 "Chamada ao Fastpath {0} - Nenhum resultado foi retornado e nós esperávamos "
 "um inteiro."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 "Chamada ao Fastpath {0} - Nenhum resultado foi retornado e nós esperávamos "
 "um inteiro."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -552,7 +551,7 @@
 "Chamada ao Fastpath {0} - Nenhum resultado foi retornado e nós esperávamos "
 "um inteiro."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "A função do fastpath {0} é desconhecida."
@@ -621,63 +620,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "função {0} recebe somente quatro argumentos."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "função {0} recebe somente dois argumentos."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "função {0} recebe somente um argumento."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "função {0} recebe dois ou três argumentos."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "função {0} não recebe nenhum argumento."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "função {0} recebe três e somente três argumentos."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Intervalo {0} ainda não foi implementado"
@@ -696,18 +702,18 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Não pode recuperar o nome de um savepoint sem nome."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "O índice da matriz está fora do intervalo: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr ""
 "O índice da matriz está fora do intervalo: {0}, número de elementos: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -722,16 +728,16 @@
 "foi criado o banco de dados. O exemplo mais comum disso é armazenar dados de "
 "8 bits em um banco de dados SQL_ASCII."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "Uma função foi executada e nada foi retornado."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr "Uma função foi executada com um número inválido de parâmetros"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -740,7 +746,7 @@
 "Uma função foi executada e o parâmetro de retorno {0} era do tipo {1} "
 "contudo tipo {2} foi registrado."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
@@ -748,12 +754,12 @@
 "Este comando não declara um parâmetro de saída. Utilize '{' ?= chamada ... "
 "'}' para declarar um)"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr "wasNull não pode ser chamado antes de obter um resultado."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -762,7 +768,7 @@
 "Parâmetro do tipo {0} foi registrado, mas uma chamada a get{1} (tiposql={2}) "
 "foi feita."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -770,28 +776,28 @@
 "Uma função foi declarada mas nenhuma chamada a registerOutParameter (1, "
 "<algum_tipo>) foi feita."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr "Nenhum saída de função foi registrada."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 "Resultados não podem ser recuperados de uma função antes dela ser executada."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Valor de Types não é suportado: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Valor do parâmetro stringtype não é suportado: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -803,132 +809,132 @@
 msgid "No results were returned by the query."
 msgstr "Nenhum resultado foi retornado pela consulta."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Um resultado foi retornado quando nenhum era esperado."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr "Mapeamento de tipos personalizados não são suportados."
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Falhou ao criar objeto para: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 "Não foi possível carregar a classe {0} responsável pelo tipo de dado {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 "Não pode mudar propriedade somente-leitura da transação no meio de uma "
 "transação."
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Conexão foi fechada."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 "Não pode mudar nível de isolamento da transação no meio de uma transação."
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Nível de isolamento da transação {0} não é suportado."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Fechando uma Conexão que não foi fechada:"
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Não foi possível traduzir dado para codificação desejada."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Tamanho da busca deve ser um valor maior ou igual a 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr "Não foi possível encontrar tipo matriz para nome fornecido {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Marcadores={0} inválidos"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Tamanho de dado {0} é inválido."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Falhou ao criar objeto para: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr "propriedade ClientInfo não é suportada."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "Tempo de espera da consulta deve ser um valor maior ou igual a 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "Definição de durabilidade do ResultSet desconhecida: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr ""
 "Não pode estabelecer um savepoint no modo de efetivação automática (auto-"
 "commit)."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "Retorno de chaves geradas automaticamente não é suportado."
 
@@ -944,47 +950,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "Não foi possível encontrar tipo de dado name nos catálogos do sistema."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "Não foi possível encontrar tipo de dado name nos catálogos do sistema."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -994,68 +1000,68 @@
 msgstr ""
 "O índice de parâmetro está fora do intervalo: {0}, número de parâmetros: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 "Não pode utilizar métodos de consulta que pegam uma consulta de um comando "
 "preparado."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Valor de Types desconhecido."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Tamanho de dado {0} é inválido."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "A JVM reclamou que não suporta a codificação {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "InputStream fornecido falhou."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Tipo desconhecido {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "Não pode converter uma instância de {0} para tipo {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Valor de Types não é suportado: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "Não pode converter uma instância de {0} para tipo {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
@@ -1065,17 +1071,17 @@
 "setObject() com um valor de Types explícito para especificar o tipo a ser "
 "usado."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "Erro inesperado ao escrever objeto grande no banco de dados."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Reader fornecido falhou."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1093,8 +1099,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "Não pode converter uma instância de {0} para tipo {1}"
@@ -1108,7 +1114,7 @@
 "inserindo registro."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "Constante de direção da busca é inválida: {0}."
@@ -1151,8 +1157,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "A JVM reclamou que não suporta a codificação: {0}"
@@ -1166,7 +1172,7 @@
 msgstr "Não pode chamar updateRow() quando estiver inserindo registro."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1186,27 +1192,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "Valor inválido para tipo {0} : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "A nome da coluna {0} não foi encontrado neste ResultSet."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1217,42 +1223,42 @@
 "chaves primárias daquela tabela. Veja a especificação na API do JDBC 2.1, "
 "seção 5.6 para obter mais detalhes."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "Este ResultSet está fechado."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 "ResultSet não está posicionado corretamente, talvez você precise chamar next."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr "dado UUID é inválido."
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Nível de isolamento da transação {0} não é suportado."
@@ -1322,35 +1328,35 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "Número máximo de registros deve ser um valor maior ou igual a 0."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "Tempo de espera da consulta deve ser um valor maior ou igual a 0."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "O tamanho máximo de um campo deve ser um valor maior ou igual a 0."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Este comando foi fechado."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 "Retorno de chaves geradas automaticamente por índice de coluna não é "
 "suportado."
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "Valor inválido para tipo {0} : {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Valor de Types não é suportado: {0}"
@@ -1363,31 +1369,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Tamanho de dado {0} é inválido."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Tamanho de dado {0} é inválido."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Falhou ao inicializar API de Objetos Grandes"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr ""
 "Objetos Grandes não podem ser usados no modo de efetivação automática (auto-"
@@ -1423,34 +1429,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Um erro ocorreu ao estabelecer uma conexão SSL."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1585,31 +1591,31 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr "Marcadores={0} inválidos"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "xid não deve ser nulo"
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr "Conexão está ocupada com outra transação"
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "suspender/recomeçar não está implementado"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1618,11 +1624,11 @@
 "Intercalação de transação não está implementado. xid={0}, currentXid={1}, "
 "state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr "Erro ao desabilitar autocommit"
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
@@ -1631,19 +1637,19 @@
 "tentou executar end sem a chamada ao start correspondente. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, fuzzy, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 "Erro ao cancelar transação preparada. rollback xid={0}, preparedXid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1652,21 +1658,21 @@
 "Não está implementado: Prepare deve ser executado utilizando a mesma conexão "
 "que iniciou a transação. currentXid={0}, prepare xid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr "Prepare executado antes do end. prepare xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Erro ao preparar transação. prepare xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr "Erro durante recuperação"
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, fuzzy, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
@@ -1674,13 +1680,13 @@
 msgstr ""
 "Erro ao cancelar transação preparada. rollback xid={0}, preparedXid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
@@ -1688,22 +1694,22 @@
 "Não está implementado: efetivada da primeira fase deve ser executada "
 "utilizando a mesma conexão que foi utilizada para iniciá-la"
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr "commit executado antes do end. commit xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "Erro durante efetivação de uma fase. commit xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
@@ -1712,7 +1718,7 @@
 "utilizado uma conexão ociosa. commit xid={0}, currentXid={1}, state={2], "
 "transactionState={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, fuzzy, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
@@ -1721,7 +1727,7 @@
 "Erro ao cancelar transação preparada. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr "Efetivação/Cancelamento heurístico não é suportado. forget xid={0}"
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/ru.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/ru.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/ru.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/ru.po	2018-08-27 15:38:30.000000000 +0000
@@ -13,7 +13,6 @@
 msgstr ""
 "Project-Id-Version: JDBC Driver for PostgreSQL 8.x.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2016-01-07 15:09+0300\n"
 "Last-Translator: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
@@ -23,15 +22,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
@@ -39,7 +38,7 @@
 msgstr ""
 
 # key: postgresql.unusual
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -48,37 +47,37 @@
 "Пожалуйста сообщите это исключение."
 
 # key: postgresql.con.failed
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Закончилось время ожидания"
 
 # key: postgresql.con.sslfail
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Подключение прервано получаением interrupt"
 
 # key: postgresql.unimplemented
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Метод {0} ещё не реализован"
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr "Ожидался ответ CopyIn, а получен {0}"
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr "Ожидался ответ CopyOut, а получен {0}"
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, fuzzy, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr "Ожидался ответ CopyOut, а получен {0}"
@@ -103,6 +102,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr "Значение byte должно быть в диапазоне 0..255, переданное значение: {0}"
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr "Не удалось узнать количество обновлённых строк по ответу {0}"
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -125,7 +129,7 @@
 msgstr ""
 "Неожиданный ответ от сервера. Ожидалось окончание потока, получен байт {0}"
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr "Невозможно разобрать SQL команду. Ошибка на позиции {0}"
@@ -193,24 +197,24 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "Индекс колонки вне диапазона: {0}. Допустимые значения: 1..{1}"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Неверное значение sslmode: {0}"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Неверное значение targetServerType: {0}"
 
 # key: postgresql.con.refused
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -220,42 +224,42 @@
 "правильно и что postmaster принимает TCP/IP-подсоединения."
 
 # key: postgresql.con.failed
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Ошибка при попытке подсоединения."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr "Не удалось найти сервер с указанным значением targetServerType: {0}"
 
 # key: postgresql.con.sslnotsupported
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Сервер не поддерживает SSL."
 
 # key: postgresql.con.sslfail
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Ошибка при установке SSL-подсоединения."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr "Сервер запросил парольную аутентификацию, но пароль не был указан."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
 # key: postgresql.con.auth
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -268,16 +272,16 @@
 "драйвером."
 
 # key: postgresql.con.setup
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Ошибка протокола.  Установление сессии не удалось."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -285,186 +289,181 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
 # key: postgresql.con.sslfail
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Ожидание COPY блокировки прервано получением interrupt"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 "Не в состоянии ассоциировать значения параметров для команды "
 "(PGBindException)"
 
 # key: postgresql.con.ioerror
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Ошибка ввода/ввывода при отправке бэкенду"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Ожидался статус команды BEGIN, но получен {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Неожиданный статус команды: {0}."
 
 # key: postgresql.con.ioerror
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Ошибка ввода/ввывода при отправке бэкенду"
 
 # key: postgresql.con.type
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Неизвестный тип ответа {0}."
 
 # key: postgresql.con.ioerror
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Ошибка ввода/ввывода при отправке бэкенду"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Неожиданный статус команды COPY: {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 "Недостаточно памяти для обработки результатов запроса. Попробуйте увеличить -"
 "Xmx или проверьте размеры обрабатываемых данных"
 
 # key: postgresql.con.sslnotsupported
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Драйвер в данный момент не поддерживате операции COPY."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr "Не удалось узнать количество обновлённых строк по ответу {0}"
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
 "requires client_encoding to be UTF8 for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
 "requires DateStyle to begin with ISO for correct operation."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -526,18 +525,18 @@
 msgid "Unsupported property name: {0}"
 msgstr "Свойство {0} не поддерживается"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 
 # key: postgresql.fp.expint
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -545,12 +544,12 @@
 msgstr ""
 
 # key: postgresql.stat.result
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr "Вызов fastpath {0} ничего не вернул, а ожидалось long"
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -558,7 +557,7 @@
 msgstr ""
 
 # key: postgresql.fp.unknown
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr ""
@@ -627,64 +626,71 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr ""
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr ""
 
 # key: postgresql.unimplemented
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Интеврвал {0} ещё не реализован"
@@ -704,19 +710,19 @@
 msgstr ""
 
 # key: postgresql.arr.range
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Индекс массива вне диапазона: {0}"
 
 # key: postgresql.arr.range
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "Индекс массива вне диапазона: {0}. Допустимые значения: 1..{1}"
 
 # key: postgresql.con.invalidchar
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -731,35 +737,35 @@
 "Типичным примером этого является хранение 8-битных данных в базе SQL_ASCII."
 
 # key: postgresql.call.noreturnval
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
 "type {1} however type {2} was registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
 # key: postgresql.call.wrongget
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -767,36 +773,36 @@
 msgstr ""
 
 # key: postgresql.call.noreturntype
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
 # key: postgresql.prep.type
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Бинарная передача не поддерживается для типа  {0}"
 
 # key: postgresql.prep.type
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Неподдерживаемое значение для параметра stringtype: {0}"
 
 # key: postgresql.stat.noresult
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -809,132 +815,132 @@
 msgstr "Запрос не вернул результатов."
 
 # key: postgresql.stat.result
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Результат возвращён когда его не ожидалось."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
 # key: postgresql.con.creobj
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Ошибка при создании объект для: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 msgid "This connection has been closed."
 msgstr "Соединение уже было закрыто"
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 
 # key: postgresql.con.isolevel
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Уровень изоляции транзакций {0} не поддерживается."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr ""
 "Соединение «утекло». Проверьте, что в коде приложения вызывается connection."
 "close(). Далее следует стектрейс того места, где создавалось проблемное "
 "соединение"
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr ""
 
 # key: postgresql.input.fetch.gt0
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Неверные флаги {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Значение таймаута должно быть неотрицательным: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
 # key: postgresql.con.creobj
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Невозможно установить свойство ClientInfo: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr ""
 
 # key: postgresql.con.isolevel
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr ""
 
@@ -948,46 +954,46 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 msgid "Unable to find keywords in the system catalogs."
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -997,86 +1003,86 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "Индекс параметра вне диапазона: {0}. Допустимые значения: 1..{1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 
 # key: postgresql.prep.type
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Неизвестное значение Types."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Неверная длина потока {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr ""
 
 # key: postgresql.con.type
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Неизвестный тип {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr ""
 
 # key: postgresql.prep.type
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Неподдерживаемый java.sql.Types тип: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1092,8 +1098,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr ""
@@ -1105,7 +1111,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr ""
@@ -1148,8 +1154,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr ""
@@ -1163,7 +1169,7 @@
 msgstr ""
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1180,71 +1186,71 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Колонки {0} не найдено в этом ResultSet’’е."
 
 # key: postgresql.updateable.notupdateable
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
 "the JDBC 2.1 API Specification, section 5.6 for more details."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "ResultSet закрыт."
 
 # key: postgresql.res.nextrequired
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr ""
 
 # key: postgresql.con.isolevel
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Уровень изоляции транзакций {0} не поддерживается."
@@ -1312,35 +1318,35 @@
 msgstr ""
 
 # key: postgresql.input.query.gt0
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr ""
 
 # key: postgresql.input.field.gt0
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr ""
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Этот Sstatement был закрыт."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr ""
 
 # key: postgresql.prep.type
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Бинарная передача не поддерживается для типа  {0}"
@@ -1353,32 +1359,32 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Неверное значение sslmode: {0}"
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Неверное значение sslmode: {0}"
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
 # key: postgresql.lo.init
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Ошибка при инициализации LargeObject API"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr ""
 "Большие объекты не могут использоваться в режиме авто-подтверждения (auto-"
@@ -1415,34 +1421,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
 # key: postgresql.con.sslfail
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 msgid "An error occurred reading the certificate"
 msgstr "Ошибка при чтении сертификата"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1585,33 +1591,33 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr "Неверные флаги {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
 # key: postgresql.unimplemented
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "Операции XA suspend/resume не реализованы"
 
 # key: postgresql.con.isolevel
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1620,11 +1626,11 @@
 "Чередование транзакций в одном соединении не поддерживается. Предыдущую "
 "транзакцию нужно завершить xid={0}, currentXid={1}, state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
@@ -1633,7 +1639,7 @@
 "Невозможно завершить транзакцию, т.к. транзакция не была начата. state={0}, "
 "start xid={1}, currentXid={2}, preparedXid={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, fuzzy, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
@@ -1641,12 +1647,12 @@
 "Ошибка при откате подготовленной транзакции. rollback xid={0}, "
 "preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1655,23 +1661,23 @@
 "В каком соединении транзакцию начинали, в таком и вызывайте prepare. По-"
 "другому не работает. currentXid={0}, prepare xid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 "Вызов prepare должен происходить только после вызова end. prepare xid={0}, "
 "state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Ошибка при выполнении prepare для транзакции {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
@@ -1680,36 +1686,36 @@
 "Ошибка при откате подготовленной транзакции. rollback xid={0}, "
 "preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 "Операция commit должна вызываться только после операции end. commit xid={0}, "
 "state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "Ошибка при однофазной фиксации транзакции. commit xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
@@ -1718,7 +1724,7 @@
 "транзакцция отсутствует). commit xid={0}, currentXid={1}, state={2], "
 "transactionState={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
@@ -1727,7 +1733,7 @@
 "Ошибка при фиксации подготовленной транзакции. commit xid={0}, "
 "preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/sr.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/sr.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/sr.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/sr.po	2018-08-27 15:38:30.000000000 +0000
@@ -8,7 +8,6 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2009-05-26 11:13+0100\n"
 "Last-Translator: Bojan Škaljac <skaljac (at) gmail.com>\n"
 "Language-Team: Srpski <skaljac@gmail.com>\n"
@@ -19,15 +18,15 @@
 "X-Poedit-Language: Serbian\n"
 "X-Poedit-Country: YUGOSLAVIA\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr "Greška u čitanju standardnih podešavanja iz driverconfig.properties"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
@@ -36,7 +35,7 @@
 "Sigurnosna podešavanja su sprečila konekciju. Verovatno je potrebno da "
 "dozvolite konekciju klasi java.net.SocketPermission na bazu na serveru."
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -44,35 +43,35 @@
 "Nešto neobično se dogodilo i drajver je zakazao. Molim prijavite ovaj "
 "izuzetak."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Isteklo je vreme za pokušaj konektovanja."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Prekinut pokušaj konektovanja."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "Metod {0} nije još impelemtiran."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -97,6 +96,13 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr ""
+"Neuspešno prekidanje prebrojavanja ažurivanja u tagu zakompletiranje "
+"komandi: {0}."
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -119,7 +125,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr "Očekivan EOF od servera, a dobijeno: {0}"
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr "Pogrešna sintaksa u funkciji ili proceduri na poziciji {0}."
@@ -177,23 +183,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "Indeks kolone van osega: {0}, broj kolona: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Nevažeća dužina toka {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Nevažeća dužina toka {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -202,40 +208,40 @@
 "Konekcija odbijena. Proverite dali je ime domćina (host) koretno i da "
 "postmaster podržava TCP/IP konekcije."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Pokušaj konektovanja propao."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Server ne podržava SSL."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "Greška se dogodila prilikom podešavanja SSL konekcije."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr ""
 "Server zahteva autentifikaciju baziranu na šifri, ali šifra nije prosleđena."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -246,16 +252,16 @@
 "conf fajl koji uključuje klijentovu IP adresu ili podmrežu, i da ta mreža "
 "koristi šemu autentifikacije koja je podržana od strane ovog drajvera."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Greška protokola.  Zakazivanje sesije propalo."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -263,29 +269,29 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 #, fuzzy
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Prekinut pokušaj konektovanja."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr "Nije moguće naći vrednost vezivnog parametra za izjavu (statement)."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
@@ -293,120 +299,120 @@
 "Ulazno/izlazna greška se dogodila prilikom slanja podataka pozadinskom "
 "procesu."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "Očekivan status komande je BEGIN, a dobijeno je {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Neočekivan komandni status: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr ""
 "Ulazno/izlazna greška se dogodila prilikom slanja podataka pozadinskom "
 "procesu."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Nepoznat tip odziva {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr ""
 "Ulazno/izlazna greška se dogodila prilikom slanja podataka pozadinskom "
 "procesu."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Očekivan EOF od servera, a dobijeno: {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
@@ -415,22 +421,15 @@
 "Dužina vezivne poruke {0} prevelika.  Ovo je možda rezultat veoma velike ili "
 "pogrešne dužine specifikacije za InputStream parametre."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr "Nestalo je memorije prilikom preuzimanja rezultata upita."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Drajver trenutno ne podržava COPY operacije."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr ""
-"Neuspešno prekidanje prebrojavanja ažurivanja u tagu zakompletiranje "
-"komandi: {0}."
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -439,7 +438,7 @@
 "Serverov client_encoding parametar je promenjen u  {0}.JDBC darajver zahteva "
 "UNICODE client_encoding  za uspešno izvršavanje operacije."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -448,7 +447,7 @@
 "Serverov DataStyle parametar promenjen u {0}. JDBC zahteva da DateStyle "
 "počinje sa ISO za uspešno završavanje operacije."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -511,19 +510,19 @@
 msgid "Unsupported property name: {0}"
 msgstr "Za tip nije podržana vrednost: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr ""
 "Fastpath poziv {0} - Nikakav rezultat nije vraćen a očekivan je integer."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr ""
 "Fastpath poziv {0} - Nikakav rezultat nije vraćen a očekivan je integer."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
@@ -531,13 +530,13 @@
 msgstr ""
 "Fastpath poziv {0} - Nikakav rezultat nije vraćen a očekivan je integer."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr ""
 "Fastpath poziv {0} - Nikakav rezultat nije vraćen a očekivan je integer."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
@@ -545,7 +544,7 @@
 msgstr ""
 "Fastpath poziv {0} - Nikakav rezultat nije vraćen a očekivan je integer."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "Fastpath funkcija {0} je nepoznata."
@@ -615,63 +614,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "Funkcija {0} prima četiri i samo četiri parametra."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "Funkcija {0} prima dva i samo dva parametra."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "Funkcija {0} prima jedan i samo jedan parametar."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "Funkcija {0} prima dva ili tri parametra."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "Funkcija {0} nema parametara."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "Funkcija {0} prima tri i samo tri parametra."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "Interval {0} još nije implementiran."
@@ -690,17 +696,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Nije moguće izvaditi ime tačke snimanja koja nema ime."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Indeks niza je van opsega: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "Indeks niza je van opsega: {0}, broj elemenata: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -715,16 +721,16 @@
 "kojima je baza kreirana.  Npr. Čuvanje 8bit podataka u SQL_ASCII bazi "
 "podataka."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "CallableStatement je izvršen ali ništa nije vrećeno kao rezultat."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr "CallableStatement je izvršen sa nevažećim brojem parametara"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -733,7 +739,7 @@
 "CallableStatement funkcija je izvršena dok je izlazni parametar {0} tipa {1} "
 "a tip {2} je registrovan kao izlazni parametar."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
@@ -741,12 +747,12 @@
 "Izraz ne deklariše izlazni parametar. Koristite '{' ?= poziv ... '}' za "
 "deklarisanje."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr "wasNull nemože biti pozvan pre zahvatanja rezultata."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -755,7 +761,7 @@
 "Parametar tipa {0} je registrovan,ali poziv za get{1} (sql tip={2}) je "
 "izvršen."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -763,28 +769,28 @@
 "CallableStatement jedeklarisan ali nije bilo poziva registerOutParameter (1, "
 "<neki_tip>)."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr "Nije registrovan nikakv izlaz iz funkcije."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 "Razultat nemože da se primi iz CallableStatement pre nego što se on izvrši."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Za tip nije podržana vrednost: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "Vrednost za parametar tipa string nije podržana: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -796,131 +802,131 @@
 msgid "No results were returned by the query."
 msgstr "Nikakav rezultat nije vraćen od strane upita."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Rezultat vraćen ali nikakav rezultat nije očekivan."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr "Mape sa korisnički definisanim tipovima nisu podržane."
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "Propao pokušaj kreiranja objekta za: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr "Nije moguće učitati kalsu {0} odgovornu za tip podataka {1}"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 "Nije moguće izmeniti read-only osobinu transakcije u sred izvršavanja "
 "transakcije."
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Konekcija je već zatvorena."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 "Nije moguće izmeniti nivo izolacije transakcije u sred izvršavanja "
 "transakcije."
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Nivo izolacije transakcije {0} nije podržan."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Dovršavanje konekcije koja nikada nije zatvorena:"
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Nije moguće prevesti podatke u odabrani encoding format."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Doneta veličina mora biti vrednost veća ili jednaka 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr "Neuspešno nalaženje liste servera za zadato ime {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Nevažeće zastavice {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Nevažeća dužina toka {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "Propao pokušaj kreiranja objekta za: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr "ClientInfo property nije podržan."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "Tajm-aut mora biti vrednost veća ili jednaka 0."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr ""
 "Nepoznata ResultSet podešavanja za mogućnost držanja (holdability): {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "U auto-commit modu nije moguće podešavanje tački snimanja."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "Vraćanje autogenerisanih ključeva nije podržano."
 
@@ -936,47 +942,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "Nije moguće pronaći ime tipa podatka u sistemskom katalogu."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "Nije moguće pronaći ime tipa podatka u sistemskom katalogu."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -985,68 +991,68 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "Index parametra je van opsega: {0}, broj parametara je: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr ""
 "Ne možete da koristite metode za upit koji uzimaju string iz upita u "
 "PreparedStatement-u."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Nepoznata vrednost za Types."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Nevažeća dužina toka {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "JVM tvrdi da ne podržava {0} encoding."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "Pribaljeni InputStream zakazao."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Nepoznat tip {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "Nije moguće kastovati instancu {0} u tip {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Za tip nije podržana vrednost: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "Nije moguće konvertovati instancu {0} u tip {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
@@ -1055,17 +1061,17 @@
 "Nije moguće zaključiti SQL tip koji bi se koristio sa instancom {0}. "
 "Koristite setObject() sa zadatim eksplicitnim tipom vrednosti."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "Neočekivana greška prilikom upisa velikog objekta u bazu podataka."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Pribavljeni čitač (Reader) zakazao."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1082,8 +1088,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "Nije moguće konvertovati instancu {0} u tip {1}"
@@ -1096,7 +1102,7 @@
 "Ne može se koristiti metod relativnog pomeranja prilikom ubacivanja redova."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "Pogrešna konstanta za direkciju donošenja: {0}."
@@ -1140,8 +1146,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "JVM tvrdi da ne podržava encoding: {0}"
@@ -1155,7 +1161,7 @@
 msgstr "Nije moguće pozvati updateRow() prilikom ubacivanja redova."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1173,27 +1179,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "Pogrešna vrednost za tip {0} : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Ime kolone {0} nije pronadjeno u ResultSet."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1204,42 +1210,42 @@
 "tabele. Pogledajte API specifikaciju za JDBC 2.1, sekciju 5.6 za više "
 "detalja."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "ResultSet je zatvoren."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr ""
 "ResultSet nije pravilno pozicioniran, možda je potrebno da pozovete next."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr "Nevažeća UUID podatak."
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Nivo izolacije transakcije {0} nije podržan."
@@ -1306,34 +1312,34 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "Maksimalni broj redova mora biti vrednosti veće ili jednake 0."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "Tajm-aut mora biti vrednost veća ili jednaka 0."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr ""
 "Maksimalna vrednost veličine polja mora biti vrednost veća ili jednaka 0."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Statement je zatvoren."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr "Vraćanje autogenerisanih ključeva po kloloni nije podržano."
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "Pogrešna vrednost za tip {0} : {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Za tip nije podržana vrednost: {0}"
@@ -1346,31 +1352,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Nevažeća dužina toka {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Nevažeća dužina toka {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "Propao pokušaj inicijalizacije LargeObject API-ja."
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "Veliki objekti (Large Object) se nemogu koristiti u auto-commit modu."
 
@@ -1404,34 +1410,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "Greška se dogodila prilikom podešavanja SSL konekcije."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1566,31 +1572,31 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr "Nevažeće zastavice {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "xid ne sme biti null"
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr "Konekcija je zauzeta sa drugom transakciom."
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "obustavljanje/nastavljanje nije implementirano."
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1599,11 +1605,11 @@
 "Preplitanje transakcija nije implementirano. xid={0}, currentXid={1}, "
 "state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr "Greška u isključivanju autokomita"
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
@@ -1612,7 +1618,7 @@
 "Pokušaj pozivanja kraja pre odgovarajućeg početka. state={0}, start xid={1}, "
 "currentXid={2}, preparedXid={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, fuzzy, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
@@ -1620,12 +1626,12 @@
 "Greška prilikom povratka na prethodo pripremljenu transakciju. rollback "
 "xid={0}, preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1635,21 +1641,21 @@
 "konekcije koja se koristi za startovanje transakcije. currentXid={0}, "
 "prepare xid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr "Pripremanje poziva pre kraja. prepare xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Greška u pripremanju transakcije. prepare xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr "Greška prilikom oporavljanja."
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
@@ -1658,13 +1664,13 @@
 "Greška prilikom povratka na prethodo pripremljenu transakciju. rollback "
 "xid={0}, preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
@@ -1672,22 +1678,22 @@
 "Nije implementirano: Commit iz jedne faze mora biti izdat uz korištenje iste "
 "konekcije koja je korištena za startovanje."
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, fuzzy, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr "commit pozvan pre kraja."
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "Kreška prilikom commit-a iz jedne faze. commit xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
@@ -1696,7 +1702,7 @@
 "besposlene konekcije. commit xid={0}, currentXid={1}, state={2], "
 "transactionState={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, fuzzy, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
@@ -1705,7 +1711,7 @@
 "Greška prilikom povratka na prethodo pripremljenu transakciju. commit "
 "xid={0}, preparedXid={1}, currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr "Heuristički commit/rollback nije podržan. forget xid={0}"
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/tr.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/tr.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/tr.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/tr.po	2018-08-27 15:38:30.000000000 +0000
@@ -7,7 +7,6 @@
 msgstr ""
 "Project-Id-Version: jdbc-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2009-05-31 21:47+0200\n"
 "Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <pgsql-tr-genel@PostgreSQL.org>\n"
@@ -19,15 +18,15 @@
 "X-Poedit-Language: Turkish\n"
 "X-Poedit-Country: TURKEY\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr "driverconfig.properties dosyasından varsayılan ayarları yükleme hatası"
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
@@ -37,7 +36,7 @@
 "SocketPermission'a veritabanına ve de bağlanacağı porta bağlantı izni "
 "vermelisiniz."
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
@@ -45,35 +44,35 @@
 "Sıradışı bir durum sürücünün hata vermesine sebep oldu. Lütfen bu durumu "
 "geliştiricilere bildirin."
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Bağlantı denemesi zaman aşımına uğradı."
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr "Bağlanırken kesildi."
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "{0} yöntemi henüz kodlanmadı."
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -98,6 +97,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr "Komut tamamlama etiketinde update sayısı yorumlanamıyor: {0}."
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -120,7 +124,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr "Sunucudan EOF beklendi; ama {0} alındı."
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr "{0} adresinde fonksiyon veya yordamda kaçış söz dizimi geçersiz."
@@ -179,23 +183,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "Sütun gçstergesi kapsam dışıdır: {0}, sütun sayısı: {1}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "Geçersiz akım uzunluğu {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "Geçersiz akım uzunluğu {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -204,39 +208,39 @@
 "Bağlantı reddedildi. Sunucu adı ve portun doğru olup olmadığını ve "
 "postmaster''in TCP/IP bağlantılarını kabul edip etmediğini kontrol ediniz."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "Bağlantı denemesi başarısız oldu."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "Sunucu SSL desteklemiyor."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "SSL bağlantısı ayarlanırken bir hata oluştu."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr "Sunucu şifre tabanlı yetkilendirme istedi; ancak bir şifre sağlanmadı."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -248,16 +252,16 @@
 "ayarlamadığınızı ve sürücü tarafından desteklenen yetkilendirme "
 "yöntemlerinden birisini kullanıp kullanmadığını kontrol ediniz."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "Protokol hatası.  Oturum kurulumu başarısız oldu."
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -265,144 +269,144 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 #, fuzzy
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr "Bağlanırken kesildi."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr "Komut için parametre değerlei bağlanamadı."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "Backend''e gönderirken bir I/O hatası oluştu."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr "BEGIN komut durumunu beklenirken {0} alındı."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr "Beklenmeyen komut durumu: {0}."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "Backend''e gönderirken bir I/O hatası oluştu."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "Bilinmeyen yanıt tipi {0}"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "Backend''e gönderirken bir I/O hatası oluştu."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, fuzzy, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr "Sunucudan EOF beklendi; ama {0} alındı."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
@@ -411,20 +415,15 @@
 "Bind mesaj uzunluğu ({0}) fazla uzun. Bu durum InputStream yalnış uzunluk "
 "belirtimlerden kaynaklanabilir."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr "Sorgu sonuçları alınırken bellek yetersiz."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "Bu sunucu şu aşamada COPY işlemleri desteklememktedir."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr "Komut tamamlama etiketinde update sayısı yorumlanamıyor: {0}."
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -434,7 +433,7 @@
 "sürücüsünün doğru çalışması için client_encoding parameteresinin UNICODE "
 "olması gerekir."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -443,7 +442,7 @@
 "Sunucunun DateStyle parametresi {0} olarak değiştirildi. JDBC sürücüsü doğru "
 "işlemesi için DateStyle tanımının ISO işle başlamasını gerekir."
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -506,36 +505,36 @@
 msgid "Unsupported property name: {0}"
 msgstr "Geçersiz Types değeri: {0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr "Fastpath call {0} - Integer beklenirken hiçbir sonuç getirilmedi."
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr "Fastpath call {0} - Integer beklenirken hiçbir sonuç getirilmedi."
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr "Fastpath call {0} - Integer beklenirken hiçbir sonuç getirilmedi."
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr "Fastpath call {0} - Integer beklenirken hiçbir sonuç getirilmedi."
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr "Fastpath call {0} - Integer beklenirken hiçbir sonuç getirilmedi."
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "{0} fastpath fonksiyonu bilinmemektedir."
@@ -603,63 +602,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "{0} fonksiyonunu yalnız dört parametre alabilir."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "{0} fonksiyonunu sadece iki parametre alabilir."
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "{0} fonksiyonunu yalnız tek bir parametre alabilir."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "{0} fonksiyonu yalnız iki veya üç argüman alabilir."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "{0} fonksiyonu parametre almaz."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "{0} fonksiyonunu sadece üç parametre alabilir."
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "{0} aralığı henüz kodlanmadı."
@@ -678,17 +684,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "Adı verilmemiş savepointin id değerine erişilemiyor."
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "Dizi göstergesi kapsam dışıdır: {0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "Dizin göstergisi kapsam dışıdır: {0}, öğe sayısı: {1}."
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -703,16 +709,16 @@
 "rastlamasıdır. Bunun en yaygın örneği 8 bitlik veriyi SQL_ASCII "
 "veritabanında saklamasıdır."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "CallableStatement çalıştırma sonucunda veri getirilmedi."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr "CallableStatement geçersiz sayıda parametre ile çalıştırıldı."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -721,7 +727,7 @@
 "CallableStatement çalıştırıldı, ancak {2} tipi kaydedilmesine rağmen "
 "döndürme parametresi {0} ve tipi {1} idi."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
@@ -729,12 +735,12 @@
 "Bu komut OUT parametresi bildirmemektedir.  Bildirmek için '{' ?= call ... "
 "'}' kullanın."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr "wasNull sonuç çekmeden önce çağırılamaz."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
@@ -743,7 +749,7 @@
 "{0} tipinde parametre tanıtıldı, ancak {1} (sqltype={2}) tipinde geri "
 "getirmek için çağrı yapıldı."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -751,27 +757,27 @@
 "CallableStatement bildirildi ancak registerOutParameter(1, < bir tip>) "
 "tanıtımı yapılmadı."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr "Hiçbir fonksiyon çıktısı kaydedilmedi."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr "CallableStatement çalıştırılmadan sonuçlar ondan alınamaz."
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "Geçersiz Types değeri: {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "strinftype parametresi için destekleneyen değer: {0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -783,129 +789,129 @@
 msgid "No results were returned by the query."
 msgstr "Sorgudan hiç bir sonuç dönmedi."
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "Hiçbir sonuç kebklenimezken sonuç getirildi."
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr "Özel tip eşleştirmeleri desteklenmiyor."
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "{0} için nesne oluşturma hatası."
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr "{1} veri tipinden sorumlu {0} sınıfı yüklenemedi"
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr ""
 "Transaction ortasında geçerli transactionun read-only özellği değiştirilemez."
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Bağlantı kapatıldı."
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr ""
 "Transaction ortasında geçerli transactionun transaction isolation level "
 "özellği değiştirilemez."
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "Transaction isolation level {0} desteklenmiyor."
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr "Kapatılmamış bağlantı sonlandırılıyor."
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "Veri, istenilen dil kodlamasına çevrilemiyor."
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "Fetch boyutu sıfır veya daha büyük bir değer olmalıdır."
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr "Belirtilen {0} adı için sunucu array tipi bulunamadı."
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "Geçersiz seçenekler {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "Geçersiz akım uzunluğu {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "{0} için nesne oluşturma hatası."
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr "Clientinfo property'si desteklenememktedir."
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "Sorgu zaman aşımı değer sıfır veya sıfırdan büyük bir sayı olmalıdır."
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "ResultSet tutabilme ayarı geçersiz: {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "Auto-commit biçimde savepoint oluşturulamıyor."
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr "Otomatik üretilen değerlerin getirilmesi desteklenememktedir."
 
@@ -920,47 +926,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "Sistem kataloglarında name veri tipi bulunamıyor."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "Sistem kataloglarında name veri tipi bulunamıyor."
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -969,66 +975,66 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "Dizin göstergisi kapsam dışıdır: {0}, öğe sayısı: {1}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr "PreparedStatement ile sorgu satırı alan sorgu yöntemleri kullanılamaz."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "Geçersiz Types değeri."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "Geçersiz akım uzunluğu {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "JVM, {0} dil kodlamasını desteklememektedir."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "Sağlanmış InputStream başarısız."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "Bilinmeyen tip {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "{0} tipi {1} tipine dönüştürülemiyor"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "Geçersiz Types değeri: {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "{0} instance, {1} tipine dönüştürülemiyor"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
@@ -1037,17 +1043,17 @@
 "{0}''nin örneği ile kullanılacak SQL tip bulunamadı. Kullanılacak tip "
 "belirtmek için kesin Types değerleri ile setObject() kullanın."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "Large object veritabanına yazılırken beklenmeyan hata."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "Sağlanmış InputStream başarısız."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1065,8 +1071,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "{0} instance, {1} tipine dönüştürülemiyor"
@@ -1078,7 +1084,7 @@
 msgstr "Insert kaydı üzerinde relative move method kullanılamaz."
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "Getirme yönü değişmezi geçersiz: {0}."
@@ -1121,8 +1127,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "JVM, {0} dil kodlamasını desteklememektedir."
@@ -1136,7 +1142,7 @@
 msgstr "Insert  kaydı üzerinde updateRow() çağırılamaz."
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1155,27 +1161,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "{0} veri tipi için geçersiz değer : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "Bu ResultSet içinde {0} sütun adı bulunamadı."
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1185,41 +1191,41 @@
 "sorgulamalı ve tablonun tüm primary key alanları belirtmelidir. Daha fazla "
 "bilgi için bk. JDBC 2.1 API Specification, section 5.6."
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "ResultSet kapalıdır."
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr "ResultSet doğru konumlanmamıştır, next işlemi çağırmanız gerekir."
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 msgid "Invalid UUID data."
 msgstr "Geçersiz UUID verisi."
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "Transaction isolation level {0} desteklenmiyor."
@@ -1285,35 +1291,35 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "En büyük getirilecek satır sayısı sıfırdan büyük olmalıdır."
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "Sorgu zaman aşımı değer sıfır veya sıfırdan büyük bir sayı olmalıdır."
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "En büyük alan boyutu sıfır ya da sıfırdan büyük bir değer olmalı."
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "Bu komut kapatıldı."
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 "Kolonların indexlenmesi ile otomatik olarak oluşturulan anahtarların "
 "döndürülmesi desteklenmiyor."
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "{0} veri tipi için geçersiz değer : {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "Geçersiz Types değeri: {0}"
@@ -1326,31 +1332,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "Geçersiz akım uzunluğu {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "Geçersiz akım uzunluğu {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "LArgeObject API ilklendirme hatası"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "Auto-commit biçimde large object kullanılamaz."
 
@@ -1384,34 +1390,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "SSL bağlantısı ayarlanırken bir hata oluştu."
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1546,31 +1552,31 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr "Geçersiz seçenekler {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr "xid null olamaz"
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr "Bağlantı, başka bir transaction tarafından meşgul ediliyor"
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "suspend/resume desteklenmiyor"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1579,11 +1585,11 @@
 "Transaction interleaving desteklenmiyor. xid={0}, currentXid={1}, state={2}, "
 "flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr "autocommit'i devre dışı bırakma sırasında hata"
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
@@ -1592,7 +1598,7 @@
 "start çağırımı olmadan end çağırılmıştır. state={0}, start xid={1}, "
 "currentXid={2}, preparedXid={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, fuzzy, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
@@ -1600,12 +1606,12 @@
 "Hazırlanmış transaction rollback hatası. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
@@ -1614,21 +1620,21 @@
 "Desteklenmiyor: Prepare, transaction başlatran bağlantı tarafından "
 "çağırmalıdır. currentXid={0}, prepare xid={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr "Sondan önce prepare çağırılmış. prepare xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr "Transaction hazırlama hatası. prepare xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr "Kurtarma sırasında hata"
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
@@ -1637,13 +1643,13 @@
 "Hazırlanmış transaction rollback hatası. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
@@ -1651,22 +1657,22 @@
 "Desteklenmiyor: one-phase commit, işlevinde başlatan ve bitiren bağlantı "
 "aynı olmalıdır"
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr "commit, sondan önce çağırıldı. commit xid={0}, state={1}"
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr "One-phase commit sırasında hata. commit xid={0}"
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
@@ -1674,7 +1680,7 @@
 "Desteklenmiyor: 2nd phase commit, atıl bir bağlantıdan başlatılmalıdır. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, fuzzy, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
@@ -1683,7 +1689,7 @@
 "Hazırlanmış transaction rollback hatası. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr "Heuristic commit/rollback desteklenmiyor. forget xid={0}"
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/zh_CN.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/zh_CN.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/zh_CN.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/zh_CN.po	2018-08-27 15:38:30.000000000 +0000
@@ -6,7 +6,6 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL JDBC Driver 8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2008-01-31 14:34+0800\n"
 "Last-Translator: 郭朝益(ChaoYi, Kuo) <Kuo.ChaoYi@gmail.com>\n"
 "Language-Team: The PostgreSQL Development Team <Kuo.ChaoYi@gmail.com>\n"
@@ -18,56 +17,56 @@
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
 msgstr "不明的原因导致驱动程序造成失败，请回报这个例外。"
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Connection 尝试逾时。"
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr ""
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "这个 {0} 方法尚未被实作。"
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -92,6 +91,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr "无法解读命令完成标签中的更新计数：{0}。"
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -112,7 +116,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr ""
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr "不正确的函式或程序 escape 语法于 {0}。"
@@ -168,23 +172,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "栏位索引超过许可范围：{0}，栏位数：{1}。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "无效的串流长度 {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "无效的串流长度 {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -192,39 +196,39 @@
 msgstr ""
 "连线被拒，请检查主机名称和埠号，并确定 postmaster 可以接受 TCP/IP 连线。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "尝试连线已失败。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "服务器不支援 SSL 连线。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "进行 SSL 连线时发生错误。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr "服务器要求使用密码验证，但是密码并未提供。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -234,16 +238,16 @@
 "不支援 {0} 验证类型。请核对您已经组态 pg_hba.conf 文件包含客户端的IP位址或网"
 "路区段，以及驱动程序所支援的验证架构模式已被支援。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "通讯协定错误，Session 初始化失败。"
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -251,163 +255,158 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "传送数据至后端时发生 I/O 错误。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "传送数据至后端时发生 I/O 错误。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "不明的回应类型 {0}。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "传送数据至后端时发生 I/O 错误。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "驱动程序目前不支援 COPY 操作。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr "无法解读命令完成标签中的更新计数：{0}。"
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -416,7 +415,7 @@
 "这服务器的 client_encoding 参数被改成 {0}，JDBC 驱动程序请求需要 "
 "client_encoding 为 UNICODE 以正确工作。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -425,7 +424,7 @@
 "这服务器的 DateStyle 参数被更改成 {0}，JDBC 驱动程序请求需要 DateStyle 以 "
 "ISO 开头以正确工作。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -488,36 +487,36 @@
 msgid "Unsupported property name: {0}"
 msgstr "未被支持的类型值：{0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr "Fastpath 呼叫 {0} - 没有传回值，且应该传回一个整数。"
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr "Fastpath 呼叫 {0} - 没有传回值，且应该传回一个整数。"
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr "Fastpath 呼叫 {0} - 没有传回值，且应该传回一个整数。"
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr "Fastpath 呼叫 {0} - 没有传回值，且应该传回一个整数。"
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr "Fastpath 呼叫 {0} - 没有传回值，且应该传回一个整数。"
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "不明的 fastpath 函式 {0}。"
@@ -583,63 +582,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "{0} 函式取得四个且仅有四个引数。"
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "{0} 函式取得二个且仅有二个引数。"
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "{0} 函式取得一个且仅有一个引数。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "{0} 函式取得二个或三个引数。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "{0} 函式无法取得任何的引数。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "{0} 函式取得三个且仅有三个引数。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "隔绝 {0} 尚未被实作。"
@@ -658,17 +664,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "无法取得未命名储存点(Savepoint)的名称。"
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "阵列索引超过许可范围：{0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "阵列索引超过许可范围：{0}，元素数量：{1}。"
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -681,17 +687,17 @@
 "发现不合法的字元，可能的原因是欲储存的数据中包含数据库的字元集不支援的字码，"
 "其中最常见例子的就是将 8 位元数据存入使用 SQL_ASCII 编码的数据库中。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "一个 CallableStatement 执行函式后没有传回值。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 #, fuzzy
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr "一个 CallableStatement 已执行包括一个无效的参数数值"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -700,25 +706,25 @@
 "一个 CallableStatement 执行函式后输出的参数类型为 {1} 值为 {0}，但是已注册的"
 "类型是 {2}。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr "这个 statement 未宣告 OUT 参数，使用 '{' ?= call ... '}' 宣告一个。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr "已注册参数类型 {0}，但是又呼叫了get{1}(sqltype={2})。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -726,27 +732,27 @@
 "已经宣告 CallableStatement 函式，但是尚未呼叫 registerOutParameter (1, "
 "<some_type>) 。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "未被支持的类型值：{0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "字符类型参数值未被支持：{0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -758,126 +764,126 @@
 msgid "No results were returned by the query."
 msgstr "查询没有传回任何结果。"
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "传回预期之外的结果。"
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "为 {0} 建立对象失败。"
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr "不能在事物交易过程中改变事物交易唯读属性。"
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Connection 已经被关闭。"
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr "不能在事务交易过程中改变事物交易隔绝等级。"
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "不支援交易隔绝等级 {0} 。"
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "无法将数据转成目标编码。"
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "数据读取笔数(fetch size)必须大于或等于 0。"
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "无效的旗标 flags {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "无效的串流长度 {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "为 {0} 建立对象失败。"
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "查询逾时等候时间必须大于或等于 0。"
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "未知的 ResultSet 可适用的设置：{0}。"
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "在自动确认事物交易模式无法建立储存点(Savepoint)。"
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr ""
 
@@ -891,47 +897,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "在系统 catalog 中找不到名称数据类型(datatype)。"
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "在系统 catalog 中找不到名称数据类型(datatype)。"
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -940,83 +946,83 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "参数索引超出许可范围：{0}，参数总数：{1}。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr "在 PreparedStatement 上不能使用获取查询字符的查询方法。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "不明的类型值。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "无效的串流长度 {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "JVM 声明并不支援 {0} 编码。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "提供的 InputStream 已失败。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "不明的类型 {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "不能转换一个 {0} 实例到类型 {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "未被支持的类型值：{0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "无法转换 {0} 到类型 {1} 的实例"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "将大型对象(large object)写入数据库时发生不明错误。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "提供的 Reader 已失败。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1032,8 +1038,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "无法转换 {0} 到类型 {1} 的实例"
@@ -1045,7 +1051,7 @@
 msgstr "不能在新增的数据列上使用相对位置 move 方法。"
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "无效的 fetch 方向常数：{0}。"
@@ -1084,8 +1090,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "JVM 声明并不支援编码：{0} 。"
@@ -1099,7 +1105,7 @@
 msgstr "不能在新增的数据列上呼叫 deleteRow()。"
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1116,27 +1122,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "不良的类型值 {0} : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "ResultSet 中找不到栏位名称 {0}。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1145,42 +1151,42 @@
 "不可更新的 ResultSet。用来产生这个 ResultSet 的 SQL 命令只能操作一个数据表，"
 "并且必需选择所有主键栏位，详细请参阅 JDBC 2.1 API 规格书 5.6 节。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "这个 ResultSet 已经被关闭。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr "查询结果指标位置不正确，您也许需要呼叫 ResultSet 的 next() 方法。"
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 #, fuzzy
 msgid "Invalid UUID data."
 msgstr "无效的旗标"
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "不支援交易隔绝等级 {0} 。"
@@ -1246,33 +1252,33 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "最大数据读取笔数必须大于或等于 0。"
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "查询逾时等候时间必须大于或等于 0。"
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "最大栏位容量必须大于或等于 0。"
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "这个 statement 已经被关闭。"
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "不良的类型值 {0} : {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "未被支持的类型值：{0}"
@@ -1285,31 +1291,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "无效的串流长度 {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "无效的串流长度 {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "初始化 LargeObject API 失败"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "大型对象无法被使用在自动确认事物交易模式。"
 
@@ -1343,34 +1349,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "进行 SSL 连线时发生错误。"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1505,31 +1511,31 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr "无效的旗标 flags {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "暂停(suspend)/再继续(resume)尚未被实作。"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1538,97 +1544,97 @@
 "事物交易隔绝(Transaction interleaving)未被实作。xid={0}, currentXid={1}, "
 "state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/zh_TW.po libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/zh_TW.po
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/translation/zh_TW.po	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/translation/zh_TW.po	2018-08-27 15:38:30.000000000 +0000
@@ -6,7 +6,6 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL JDBC Driver 8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-05 10:57+0300\n"
 "PO-Revision-Date: 2008-01-21 16:50+0800\n"
 "Last-Translator: 郭朝益(ChaoYi, Kuo) <Kuo.ChaoYi@gmail.com>\n"
 "Language-Team: The PostgreSQL Development Team <Kuo.ChaoYi@gmail.com>\n"
@@ -18,56 +17,56 @@
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: org/postgresql/Driver.java:214
+#: org/postgresql/Driver.java:217
 msgid "Error loading default settings from driverconfig.properties"
 msgstr ""
 
-#: org/postgresql/Driver.java:226
+#: org/postgresql/Driver.java:229
 msgid "Properties for the driver contains a non-string value for the key "
 msgstr ""
 
-#: org/postgresql/Driver.java:270
+#: org/postgresql/Driver.java:272
 msgid ""
 "Your security policy has prevented the connection from being attempted.  You "
 "probably need to grant the connect java.net.SocketPermission to the database "
 "server host and port that you wish to connect to."
 msgstr ""
 
-#: org/postgresql/Driver.java:276 org/postgresql/Driver.java:408
+#: org/postgresql/Driver.java:278 org/postgresql/Driver.java:410
 msgid ""
 "Something unusual has occurred to cause the driver to fail. Please report "
 "this exception."
 msgstr "不明的原因導致驅動程式造成失敗，請回報這個例外。"
 
-#: org/postgresql/Driver.java:416
+#: org/postgresql/Driver.java:418
 msgid "Connection attempt timed out."
 msgstr "Connection 嘗試逾時。"
 
-#: org/postgresql/Driver.java:429
+#: org/postgresql/Driver.java:431
 msgid "Interrupted while attempting to connect."
 msgstr ""
 
-#: org/postgresql/Driver.java:682
+#: org/postgresql/Driver.java:687
 #, java-format
 msgid "Method {0} is not yet implemented."
 msgstr "這個 {0} 方法尚未被實作。"
 
-#: org/postgresql/PGProperty.java:535 org/postgresql/PGProperty.java:555
+#: org/postgresql/PGProperty.java:537 org/postgresql/PGProperty.java:557
 #, java-format
 msgid "{0} parameter value must be an integer but was: {1}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:53
+#: org/postgresql/copy/CopyManager.java:49
 #, java-format
 msgid "Requested CopyIn but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:64
+#: org/postgresql/copy/CopyManager.java:60
 #, java-format
 msgid "Requested CopyOut but got {0}"
 msgstr ""
 
-#: org/postgresql/copy/CopyManager.java:75
+#: org/postgresql/copy/CopyManager.java:71
 #, java-format
 msgid "Requested CopyDual but got {0}"
 msgstr ""
@@ -92,6 +91,11 @@
 msgid "Cannot write to copy a byte of value {0}"
 msgstr ""
 
+#: org/postgresql/core/CommandCompleteParser.java:71
+#, fuzzy, java-format
+msgid "Unable to parse the count in command completion tag: {0}."
+msgstr "無法解讀命令完成標籤中的更新計數：{0}。"
+
 #: org/postgresql/core/ConnectionFactory.java:57
 #, java-format
 msgid "A connection could not be made using the requested protocol {0}."
@@ -112,7 +116,7 @@
 msgid "Expected an EOF from server, got: {0}"
 msgstr ""
 
-#: org/postgresql/core/Parser.java:1006
+#: org/postgresql/core/Parser.java:1051
 #, java-format
 msgid "Malformed function or procedure escape syntax at offset {0}."
 msgstr "不正確的函式或程序 escape 語法於 {0}。"
@@ -168,23 +172,23 @@
 #: org/postgresql/core/v3/CompositeParameterList.java:33
 #: org/postgresql/core/v3/SimpleParameterList.java:54
 #: org/postgresql/core/v3/SimpleParameterList.java:65
-#: org/postgresql/jdbc/PgResultSet.java:2757
-#: org/postgresql/jdbc/PgResultSetMetaData.java:494
+#: org/postgresql/jdbc/PgResultSet.java:2755
+#: org/postgresql/jdbc/PgResultSetMetaData.java:388
 #, java-format
 msgid "The column index is out of range: {0}, number of columns: {1}."
 msgstr "欄位索引超過許可範圍：{0}，欄位數：{1}。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:109
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:103
 #, fuzzy, java-format
 msgid "Invalid sslmode value: {0}"
 msgstr "無效的串流長度 {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:124
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:118
 #, fuzzy, java-format
 msgid "Invalid targetServerType value: {0}"
 msgstr "無效的串流長度 {0}."
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:246
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:239
 #, fuzzy, java-format
 msgid ""
 "Connection to {0} refused. Check that the hostname and port are correct and "
@@ -192,39 +196,39 @@
 msgstr ""
 "連線被拒，請檢查主機名稱和埠號，並確定 postmaster 可以接受 TCP/IP 連線。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:257
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:250
 #: org/postgresql/core/v3/replication/V3ReplicationProtocol.java:133
 msgid "The connection attempt failed."
 msgstr "嘗試連線已失敗。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:272
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:265
 #, java-format
 msgid "Could not find a server with specified targetServerType: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:368
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:381
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:361
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:374
 msgid "The server does not support SSL."
 msgstr "伺服器不支援 SSL 連線。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:395
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:388
 msgid "An error occurred while setting up the SSL connection."
 msgstr "進行 SSL 連線時發生錯誤。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:496
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:523
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:484
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:511
 msgid ""
 "The server requested password-based authentication, but no password was "
 "provided."
 msgstr "伺服器要求使用密碼驗證，但是密碼並未提供。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:626
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:614
 msgid ""
 "SCRAM authentication is not supported by this driver. You need JDK >= 8 and "
 "pgjdbc >= 42.2.0 (not \".jre\" versions)"
 msgstr ""
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:650
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:638
 #, java-format
 msgid ""
 "The authentication type {0} is not supported. Check that you have configured "
@@ -234,16 +238,16 @@
 "不支援 {0} 驗證型別。請核對您已經組態 pg_hba.conf 檔案包含客戶端的IP位址或網"
 "路區段，以及驅動程式所支援的驗證架構模式已被支援。"
 
-#: org/postgresql/core/v3/ConnectionFactoryImpl.java:657
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2550
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2581
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2585
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2653
+#: org/postgresql/core/v3/ConnectionFactoryImpl.java:645
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2543
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2580
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2648
 #: org/postgresql/gss/GssAction.java:126
 msgid "Protocol error.  Session setup failed."
 msgstr "通訊協定錯誤，Session 初始化失敗。"
 
-#: org/postgresql/core/v3/CopyInImpl.java:47
+#: org/postgresql/core/v3/CopyInImpl.java:49
 msgid "CopyIn copy direction can't receive data"
 msgstr ""
 
@@ -251,163 +255,158 @@
 msgid "CommandComplete expected COPY but got: "
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:161
+#: org/postgresql/core/v3/QueryExecutorImpl.java:163
 msgid "Tried to obtain lock while already holding it"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:177
+#: org/postgresql/core/v3/QueryExecutorImpl.java:179
 msgid "Tried to break lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:195
+#: org/postgresql/core/v3/QueryExecutorImpl.java:197
 msgid "Interrupted while waiting to obtain lock on database connection"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:327
+#: org/postgresql/core/v3/QueryExecutorImpl.java:329
 msgid "Unable to bind parameter values for statement."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:333
-#: org/postgresql/core/v3/QueryExecutorImpl.java:485
-#: org/postgresql/core/v3/QueryExecutorImpl.java:559
-#: org/postgresql/core/v3/QueryExecutorImpl.java:602
-#: org/postgresql/core/v3/QueryExecutorImpl.java:729
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2372
+#: org/postgresql/core/v3/QueryExecutorImpl.java:335
+#: org/postgresql/core/v3/QueryExecutorImpl.java:487
+#: org/postgresql/core/v3/QueryExecutorImpl.java:561
+#: org/postgresql/core/v3/QueryExecutorImpl.java:604
+#: org/postgresql/core/v3/QueryExecutorImpl.java:731
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2377
 #: org/postgresql/util/StreamWrapper.java:130
 #, fuzzy
 msgid "An I/O error occurred while sending to the backend."
 msgstr "傳送資料至後端時發生 I/O 錯誤。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:534
-#: org/postgresql/core/v3/QueryExecutorImpl.java:576
+#: org/postgresql/core/v3/QueryExecutorImpl.java:536
+#: org/postgresql/core/v3/QueryExecutorImpl.java:578
 #, java-format
 msgid "Expected command status BEGIN, got {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:581
+#: org/postgresql/core/v3/QueryExecutorImpl.java:583
 #: org/postgresql/jdbc/PgResultSet.java:1778
 #, java-format
 msgid "Unexpected command status: {0}."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:687
+#: org/postgresql/core/v3/QueryExecutorImpl.java:689
 #, fuzzy
 msgid "An error occurred while trying to get the socket timeout."
 msgstr "傳送資料至後端時發生 I/O 錯誤。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:722
-#: org/postgresql/core/v3/QueryExecutorImpl.java:798
+#: org/postgresql/core/v3/QueryExecutorImpl.java:724
+#: org/postgresql/core/v3/QueryExecutorImpl.java:800
 #, java-format
 msgid "Unknown Response Type {0}."
 msgstr "不明的回應類型 {0}。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:745
+#: org/postgresql/core/v3/QueryExecutorImpl.java:747
 #, fuzzy
 msgid "An error occurred while trying to reset the socket timeout."
 msgstr "傳送資料至後端時發生 I/O 錯誤。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:843
+#: org/postgresql/core/v3/QueryExecutorImpl.java:845
 msgid "Database connection failed when starting copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:878
+#: org/postgresql/core/v3/QueryExecutorImpl.java:880
 msgid "Tried to cancel an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:917
+#: org/postgresql/core/v3/QueryExecutorImpl.java:919
 msgid "Database connection failed when canceling copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:933
+#: org/postgresql/core/v3/QueryExecutorImpl.java:935
 msgid "Missing expected error response to copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:937
+#: org/postgresql/core/v3/QueryExecutorImpl.java:939
 #, java-format
 msgid "Got {0} error responses to single copy cancel request"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:952
+#: org/postgresql/core/v3/QueryExecutorImpl.java:954
 msgid "Tried to end inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:967
+#: org/postgresql/core/v3/QueryExecutorImpl.java:969
 msgid "Database connection failed when ending copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:985
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1005
+#: org/postgresql/core/v3/QueryExecutorImpl.java:987
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1007
 msgid "Tried to write to an inactive copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:998
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1013
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1000
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1015
 msgid "Database connection failed when writing to copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1028
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1030
 msgid "Tried to read from inactive copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1035
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1037
 msgid "Database connection failed when reading from copy"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1101
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1103
 #, java-format
 msgid "Received CommandComplete ''{0}'' without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1126
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1128
 #, java-format
 msgid "Got CopyInResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1140
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1142
 #, java-format
 msgid "Got CopyOutResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1154
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1156
 #, java-format
 msgid "Got CopyBothResponse from server during an active {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1170
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1172
 msgid "Got CopyData without an active copy operation"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1174
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1176
 #, java-format
 msgid "Unexpected copydata from server for {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1234
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1236
 #, java-format
 msgid "Unexpected packet type during copy: {0}"
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:1524
+#: org/postgresql/core/v3/QueryExecutorImpl.java:1526
 #, java-format
 msgid ""
 "Bind message length {0} too long.  This can be caused by very large or "
 "incorrect length specifications on InputStream parameters."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2145
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2150
 msgid "Ran out of memory retrieving query results."
 msgstr ""
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2313
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2318
 msgid "The driver currently does not support COPY operations."
 msgstr "驅動程式目前不支援 COPY 操作。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2487
-#, fuzzy, java-format
-msgid "Unable to parse the count in command completion tag: {0}."
-msgstr "無法解讀命令完成標籤中的更新計數：{0}。"
-
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2610
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2605
 #, fuzzy, java-format
 msgid ""
 "The server''s client_encoding parameter was changed to {0}. The JDBC driver "
@@ -416,7 +415,7 @@
 "這伺服器的 client_encoding 參數被改成 {0}，JDBC 驅動程式請求需要 "
 "client_encoding 為 UNICODE 以正確工作。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2620
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2615
 #, java-format
 msgid ""
 "The server''s DateStyle parameter was changed to {0}. The JDBC driver "
@@ -425,7 +424,7 @@
 "這伺服器的 DateStyle 參數被更改成 {0}，JDBC 驅動程式請求需要 DateStyle 以 "
 "ISO 開頭以正確工作。"
 
-#: org/postgresql/core/v3/QueryExecutorImpl.java:2633
+#: org/postgresql/core/v3/QueryExecutorImpl.java:2628
 #, java-format
 msgid ""
 "The server''s standard_conforming_strings parameter was reported as {0}. The "
@@ -488,36 +487,36 @@
 msgid "Unsupported property name: {0}"
 msgstr "未被支持的型別值：{0}"
 
-#: org/postgresql/fastpath/Fastpath.java:86
+#: org/postgresql/fastpath/Fastpath.java:84
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a numeric."
 msgstr "Fastpath 呼叫 {0} - 沒有傳回值，且應該傳回一個整數。"
 
-#: org/postgresql/fastpath/Fastpath.java:163
+#: org/postgresql/fastpath/Fastpath.java:161
 #, java-format
 msgid "Fastpath call {0} - No result was returned and we expected an integer."
 msgstr "Fastpath 呼叫 {0} - 沒有傳回值，且應該傳回一個整數。"
 
-#: org/postgresql/fastpath/Fastpath.java:171
+#: org/postgresql/fastpath/Fastpath.java:169
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting an "
 "integer."
 msgstr "Fastpath 呼叫 {0} - 沒有傳回值，且應該傳回一個整數。"
 
-#: org/postgresql/fastpath/Fastpath.java:188
+#: org/postgresql/fastpath/Fastpath.java:186
 #, fuzzy, java-format
 msgid "Fastpath call {0} - No result was returned and we expected a long."
 msgstr "Fastpath 呼叫 {0} - 沒有傳回值，且應該傳回一個整數。"
 
-#: org/postgresql/fastpath/Fastpath.java:196
+#: org/postgresql/fastpath/Fastpath.java:194
 #, fuzzy, java-format
 msgid ""
 "Fastpath call {0} - No result was returned or wrong size while expecting a "
 "long."
 msgstr "Fastpath 呼叫 {0} - 沒有傳回值，且應該傳回一個整數。"
 
-#: org/postgresql/fastpath/Fastpath.java:308
+#: org/postgresql/fastpath/Fastpath.java:297
 #, java-format
 msgid "The fastpath function {0} is unknown."
 msgstr "不明的 fastpath 函式 {0}。"
@@ -583,63 +582,70 @@
 msgstr ""
 
 #: org/postgresql/jdbc/EscapedFunctions.java:240
+#: org/postgresql/jdbc/EscapedFunctions2.java:167
 #, java-format
 msgid "{0} function takes four and only four argument."
 msgstr "{0} 函式取得四個且僅有四個引數。"
 
 #: org/postgresql/jdbc/EscapedFunctions.java:270
-#: org/postgresql/jdbc/EscapedFunctions.java:344
-#: org/postgresql/jdbc/EscapedFunctions.java:749
-#: org/postgresql/jdbc/EscapedFunctions.java:787
+#: org/postgresql/jdbc/EscapedFunctions.java:337
+#: org/postgresql/jdbc/EscapedFunctions.java:740
+#: org/postgresql/jdbc/EscapedFunctions2.java:196
+#: org/postgresql/jdbc/EscapedFunctions2.java:263
+#: org/postgresql/jdbc/EscapedFunctions2.java:665
 #, java-format
 msgid "{0} function takes two and only two arguments."
 msgstr "{0} 函式取得二個且僅有二個引數。"
 
 #: org/postgresql/jdbc/EscapedFunctions.java:288
-#: org/postgresql/jdbc/EscapedFunctions.java:326
-#: org/postgresql/jdbc/EscapedFunctions.java:446
-#: org/postgresql/jdbc/EscapedFunctions.java:461
-#: org/postgresql/jdbc/EscapedFunctions.java:476
-#: org/postgresql/jdbc/EscapedFunctions.java:491
-#: org/postgresql/jdbc/EscapedFunctions.java:506
-#: org/postgresql/jdbc/EscapedFunctions.java:521
-#: org/postgresql/jdbc/EscapedFunctions.java:536
-#: org/postgresql/jdbc/EscapedFunctions.java:551
-#: org/postgresql/jdbc/EscapedFunctions.java:566
-#: org/postgresql/jdbc/EscapedFunctions.java:581
-#: org/postgresql/jdbc/EscapedFunctions.java:596
-#: org/postgresql/jdbc/EscapedFunctions.java:611
-#: org/postgresql/jdbc/EscapedFunctions.java:775
+#: org/postgresql/jdbc/EscapedFunctions.java:441
+#: org/postgresql/jdbc/EscapedFunctions.java:467
+#: org/postgresql/jdbc/EscapedFunctions.java:526
+#: org/postgresql/jdbc/EscapedFunctions.java:728
+#: org/postgresql/jdbc/EscapedFunctions2.java:211
+#: org/postgresql/jdbc/EscapedFunctions2.java:355
+#: org/postgresql/jdbc/EscapedFunctions2.java:381
+#: org/postgresql/jdbc/EscapedFunctions2.java:440
+#: org/postgresql/jdbc/EscapedFunctions2.java:654
 #, java-format
 msgid "{0} function takes one and only one argument."
 msgstr "{0} 函式取得一個且僅有一個引數。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:310
-#: org/postgresql/jdbc/EscapedFunctions.java:391
+#: org/postgresql/jdbc/EscapedFunctions.java:312
+#: org/postgresql/jdbc/EscapedFunctions.java:386
+#: org/postgresql/jdbc/EscapedFunctions2.java:238
+#: org/postgresql/jdbc/EscapedFunctions2.java:307
 #, java-format
 msgid "{0} function takes two or three arguments."
 msgstr "{0} 函式取得二個或三個引數。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:416
-#: org/postgresql/jdbc/EscapedFunctions.java:431
-#: org/postgresql/jdbc/EscapedFunctions.java:734
-#: org/postgresql/jdbc/EscapedFunctions.java:764
+#: org/postgresql/jdbc/EscapedFunctions.java:411
+#: org/postgresql/jdbc/EscapedFunctions.java:426
+#: org/postgresql/jdbc/EscapedFunctions.java:693
+#: org/postgresql/jdbc/EscapedFunctions.java:719
+#: org/postgresql/jdbc/EscapedFunctions2.java:645
 #, java-format
 msgid "{0} function doesn''t take any argument."
 msgstr "{0} 函式無法取得任何的引數。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:627
-#: org/postgresql/jdbc/EscapedFunctions.java:680
+#: org/postgresql/jdbc/EscapedFunctions.java:586
+#: org/postgresql/jdbc/EscapedFunctions.java:639
+#: org/postgresql/jdbc/EscapedFunctions2.java:500
+#: org/postgresql/jdbc/EscapedFunctions2.java:571
 #, java-format
 msgid "{0} function takes three and only three arguments."
 msgstr "{0} 函式取得三個且僅有三個引數。"
 
-#: org/postgresql/jdbc/EscapedFunctions.java:640
-#: org/postgresql/jdbc/EscapedFunctions.java:661
-#: org/postgresql/jdbc/EscapedFunctions.java:664
-#: org/postgresql/jdbc/EscapedFunctions.java:697
-#: org/postgresql/jdbc/EscapedFunctions.java:710
-#: org/postgresql/jdbc/EscapedFunctions.java:713
+#: org/postgresql/jdbc/EscapedFunctions.java:599
+#: org/postgresql/jdbc/EscapedFunctions.java:620
+#: org/postgresql/jdbc/EscapedFunctions.java:623
+#: org/postgresql/jdbc/EscapedFunctions.java:656
+#: org/postgresql/jdbc/EscapedFunctions.java:669
+#: org/postgresql/jdbc/EscapedFunctions.java:672
+#: org/postgresql/jdbc/EscapedFunctions2.java:510
+#: org/postgresql/jdbc/EscapedFunctions2.java:527
+#: org/postgresql/jdbc/EscapedFunctions2.java:585
+#: org/postgresql/jdbc/EscapedFunctions2.java:597
 #, java-format
 msgid "Interval {0} not yet implemented"
 msgstr "隔絕 {0} 尚未被實作。"
@@ -658,17 +664,17 @@
 msgid "Cannot retrieve the name of an unnamed savepoint."
 msgstr "無法取得未命名儲存點(Savepoint)的名稱。"
 
-#: org/postgresql/jdbc/PgArray.java:157 org/postgresql/jdbc/PgArray.java:844
+#: org/postgresql/jdbc/PgArray.java:155 org/postgresql/jdbc/PgArray.java:842
 #, java-format
 msgid "The array index is out of range: {0}"
 msgstr "陣列索引超過許可範圍：{0}"
 
-#: org/postgresql/jdbc/PgArray.java:178 org/postgresql/jdbc/PgArray.java:861
+#: org/postgresql/jdbc/PgArray.java:176 org/postgresql/jdbc/PgArray.java:859
 #, java-format
 msgid "The array index is out of range: {0}, number of elements: {1}."
 msgstr "陣列索引超過許可範圍：{0}，元素數量：{1}。"
 
-#: org/postgresql/jdbc/PgArray.java:210
+#: org/postgresql/jdbc/PgArray.java:208
 #: org/postgresql/jdbc/PgResultSet.java:1930
 #: org/postgresql/util/HStoreConverter.java:43
 #: org/postgresql/util/HStoreConverter.java:74
@@ -681,17 +687,17 @@
 "發現不合法的字元，可能的原因是欲儲存的資料中包含資料庫的字元集不支援的字碼，"
 "其中最常見例子的就是將 8 位元資料存入使用 SQL_ASCII 編碼的資料庫中。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:86
-#: org/postgresql/jdbc/PgCallableStatement.java:96
+#: org/postgresql/jdbc/PgCallableStatement.java:85
+#: org/postgresql/jdbc/PgCallableStatement.java:95
 msgid "A CallableStatement was executed with nothing returned."
 msgstr "一個 CallableStatement 執行函式後沒有傳回值。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:107
+#: org/postgresql/jdbc/PgCallableStatement.java:106
 #, fuzzy
 msgid "A CallableStatement was executed with an invalid number of parameters"
 msgstr "一個 CallableStatement 已執行包括一個無效的參數數值"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:145
+#: org/postgresql/jdbc/PgCallableStatement.java:144
 #, java-format
 msgid ""
 "A CallableStatement function was executed and the out parameter {0} was of "
@@ -700,25 +706,25 @@
 "一個 CallableStatement 執行函式後輸出的參數型別為 {1} 值為 {0}，但是已註冊的"
 "型別是 {2}。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:202
+#: org/postgresql/jdbc/PgCallableStatement.java:206
 msgid ""
 "This statement does not declare an OUT parameter.  Use '{' ?= call ... '}' "
 "to declare one."
 msgstr "這個 statement 未宣告 OUT 參數，使用 '{' ?= call ... '}' 宣告一個。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:246
+#: org/postgresql/jdbc/PgCallableStatement.java:229
 msgid "wasNull cannot be call before fetching a result."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:384
-#: org/postgresql/jdbc/PgCallableStatement.java:403
+#: org/postgresql/jdbc/PgCallableStatement.java:367
+#: org/postgresql/jdbc/PgCallableStatement.java:386
 #, java-format
 msgid ""
 "Parameter of type {0} was registered, but call to get{1} (sqltype={2}) was "
 "made."
 msgstr "已註冊參數型別 {0}，但是又呼叫了get{1}(sqltype={2})。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:424
+#: org/postgresql/jdbc/PgCallableStatement.java:407
 msgid ""
 "A CallableStatement was declared, but no call to registerOutParameter(1, "
 "<some type>) was made."
@@ -726,27 +732,27 @@
 "已經宣告 CallableStatement 函式，但是尚未呼叫 registerOutParameter (1, "
 "<some_type>) 。"
 
-#: org/postgresql/jdbc/PgCallableStatement.java:430
+#: org/postgresql/jdbc/PgCallableStatement.java:413
 msgid "No function outputs were registered."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:436
+#: org/postgresql/jdbc/PgCallableStatement.java:419
 msgid ""
 "Results cannot be retrieved from a CallableStatement before it is executed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgCallableStatement.java:703
+#: org/postgresql/jdbc/PgCallableStatement.java:686
 #, fuzzy, java-format
 msgid "Unsupported type conversion to {1}."
 msgstr "未被支持的型別值：{0}"
 
-#: org/postgresql/jdbc/PgConnection.java:272
+#: org/postgresql/jdbc/PgConnection.java:241
 #, java-format
 msgid "Unsupported value for stringtype parameter: {0}"
 msgstr "字串型別參數值未被支持：{0}"
 
 #: org/postgresql/jdbc/PgConnection.java:424
-#: org/postgresql/jdbc/PgPreparedStatement.java:119
+#: org/postgresql/jdbc/PgPreparedStatement.java:107
 #: org/postgresql/jdbc/PgStatement.java:225
 #: org/postgresql/jdbc/TypeInfoCache.java:226
 #: org/postgresql/jdbc/TypeInfoCache.java:371
@@ -758,126 +764,126 @@
 msgid "No results were returned by the query."
 msgstr "查詢沒有傳回任何結果。"
 
-#: org/postgresql/jdbc/PgConnection.java:441
+#: org/postgresql/jdbc/PgConnection.java:442
 #: org/postgresql/jdbc/PgStatement.java:254
 msgid "A result was returned when none was expected."
 msgstr "傳回預期之外的結果。"
 
-#: org/postgresql/jdbc/PgConnection.java:545
+#: org/postgresql/jdbc/PgConnection.java:547
 msgid "Custom type maps are not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:587
+#: org/postgresql/jdbc/PgConnection.java:589
 #, java-format
 msgid "Failed to create object for: {0}."
 msgstr "為 {0} 建立物件失敗。"
 
-#: org/postgresql/jdbc/PgConnection.java:641
+#: org/postgresql/jdbc/PgConnection.java:643
 #, java-format
 msgid "Unable to load the class {0} responsible for the datatype {1}"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:693
+#: org/postgresql/jdbc/PgConnection.java:705
 msgid ""
 "Cannot change transaction read-only property in the middle of a transaction."
 msgstr "不能在事物交易過程中改變事物交易唯讀屬性。"
 
-#: org/postgresql/jdbc/PgConnection.java:756
+#: org/postgresql/jdbc/PgConnection.java:772
 msgid "Cannot commit when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:767
-#: org/postgresql/jdbc/PgConnection.java:1384
-#: org/postgresql/jdbc/PgConnection.java:1428
+#: org/postgresql/jdbc/PgConnection.java:783
+#: org/postgresql/jdbc/PgConnection.java:1401
+#: org/postgresql/jdbc/PgConnection.java:1445
 #, fuzzy
 msgid "This connection has been closed."
 msgstr "Connection 已經被關閉。"
 
-#: org/postgresql/jdbc/PgConnection.java:777
+#: org/postgresql/jdbc/PgConnection.java:794
 msgid "Cannot rollback when autoCommit is enabled."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:827
+#: org/postgresql/jdbc/PgConnection.java:844
 msgid ""
 "Cannot change transaction isolation level in the middle of a transaction."
 msgstr "不能在事務交易過程中改變事物交易隔絕等級。"
 
-#: org/postgresql/jdbc/PgConnection.java:833
+#: org/postgresql/jdbc/PgConnection.java:850
 #, java-format
 msgid "Transaction isolation level {0} not supported."
 msgstr "不支援交易隔絕等級 {0} 。"
 
-#: org/postgresql/jdbc/PgConnection.java:878
+#: org/postgresql/jdbc/PgConnection.java:895
 msgid "Finalizing a Connection that was never closed:"
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:945
+#: org/postgresql/jdbc/PgConnection.java:962
 msgid "Unable to translate data into the desired encoding."
 msgstr "無法將資料轉成目標編碼。"
 
-#: org/postgresql/jdbc/PgConnection.java:1008
+#: org/postgresql/jdbc/PgConnection.java:1025
 #: org/postgresql/jdbc/PgResultSet.java:1817
-#: org/postgresql/jdbc/PgStatement.java:903
+#: org/postgresql/jdbc/PgStatement.java:908
 msgid "Fetch size must be a value greater to or equal to 0."
 msgstr "資料讀取筆數(fetch size)必須大於或等於 0。"
 
-#: org/postgresql/jdbc/PgConnection.java:1289
-#: org/postgresql/jdbc/PgConnection.java:1330
+#: org/postgresql/jdbc/PgConnection.java:1306
+#: org/postgresql/jdbc/PgConnection.java:1347
 #, java-format
 msgid "Unable to find server array type for provided name {0}."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1312
+#: org/postgresql/jdbc/PgConnection.java:1329
 #, fuzzy, java-format
 msgid "Invalid elements {0}"
 msgstr "無效的旗標 {0}"
 
-#: org/postgresql/jdbc/PgConnection.java:1348
+#: org/postgresql/jdbc/PgConnection.java:1365
 #, fuzzy, java-format
 msgid "Invalid timeout ({0}<0)."
 msgstr "無效的串流長度 {0}."
 
-#: org/postgresql/jdbc/PgConnection.java:1372
+#: org/postgresql/jdbc/PgConnection.java:1389
 msgid "Validating connection."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1405
+#: org/postgresql/jdbc/PgConnection.java:1422
 #, fuzzy, java-format
 msgid "Failed to set ClientInfo property: {0}"
 msgstr "為 {0} 建立物件失敗。"
 
-#: org/postgresql/jdbc/PgConnection.java:1415
+#: org/postgresql/jdbc/PgConnection.java:1432
 msgid "ClientInfo property not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1441
-msgid "One ore more ClientInfo failed."
+#: org/postgresql/jdbc/PgConnection.java:1458
+msgid "One or more ClientInfo failed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1540
+#: org/postgresql/jdbc/PgConnection.java:1559
 #, fuzzy
 msgid "Network timeout must be a value greater than or equal to 0."
 msgstr "查詢逾時等候時間必須大於或等於 0。"
 
-#: org/postgresql/jdbc/PgConnection.java:1552
+#: org/postgresql/jdbc/PgConnection.java:1571
 msgid "Unable to set network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1563
+#: org/postgresql/jdbc/PgConnection.java:1582
 msgid "Unable to get network timeout."
 msgstr ""
 
-#: org/postgresql/jdbc/PgConnection.java:1580
+#: org/postgresql/jdbc/PgConnection.java:1599
 #, java-format
 msgid "Unknown ResultSet holdability setting: {0}."
 msgstr "未知的 ResultSet 可適用的設置：{0}。"
 
-#: org/postgresql/jdbc/PgConnection.java:1598
-#: org/postgresql/jdbc/PgConnection.java:1619
+#: org/postgresql/jdbc/PgConnection.java:1617
+#: org/postgresql/jdbc/PgConnection.java:1638
 msgid "Cannot establish a savepoint in auto-commit mode."
 msgstr "在自動確認事物交易模式無法建立儲存點(Savepoint)。"
 
-#: org/postgresql/jdbc/PgConnection.java:1685
+#: org/postgresql/jdbc/PgConnection.java:1707
 msgid "Returning autogenerated keys is not supported."
 msgstr ""
 
@@ -891,47 +897,47 @@
 msgid "Unable to find name datatype in the system catalogs."
 msgstr "在系統 catalog 中找不到名稱資料類型(datatype)。"
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:323
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:322
 #, fuzzy
 msgid "Unable to find keywords in the system catalogs."
 msgstr "在系統 catalog 中找不到名稱資料類型(datatype)。"
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "oid"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1105
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1095
 msgid "proname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1107
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1558
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1097
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1548
 msgid "typtype"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1110
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1100
 msgid "proargtypes"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1576
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1566
 msgid "adsrc"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1589
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1579
 msgid "attidentity"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1685
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1761
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1675
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1751
 msgid "rolname"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1686
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1762
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1676
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1752
 msgid "relacl"
 msgstr ""
 
-#: org/postgresql/jdbc/PgDatabaseMetaData.java:1692
+#: org/postgresql/jdbc/PgDatabaseMetaData.java:1682
 msgid "attacl"
 msgstr ""
 
@@ -940,83 +946,83 @@
 msgid "The parameter index is out of range: {0}, number of parameters: {1}."
 msgstr "參數索引超出許可範圍：{0}，參數總數：{1}。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:106
+#: org/postgresql/jdbc/PgPreparedStatement.java:94
+#: org/postgresql/jdbc/PgPreparedStatement.java:115
 #: org/postgresql/jdbc/PgPreparedStatement.java:127
-#: org/postgresql/jdbc/PgPreparedStatement.java:139
-#: org/postgresql/jdbc/PgPreparedStatement.java:1035
+#: org/postgresql/jdbc/PgPreparedStatement.java:1008
 msgid ""
 "Can''t use query methods that take a query string on a PreparedStatement."
 msgstr "在 PreparedStatement 上不能使用獲取查詢字串的查詢方法。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:249
+#: org/postgresql/jdbc/PgPreparedStatement.java:237
 msgid "Unknown Types value."
 msgstr "不明的型別值。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:382
-#: org/postgresql/jdbc/PgPreparedStatement.java:439
-#: org/postgresql/jdbc/PgPreparedStatement.java:1191
-#: org/postgresql/jdbc/PgPreparedStatement.java:1490
+#: org/postgresql/jdbc/PgPreparedStatement.java:364
+#: org/postgresql/jdbc/PgPreparedStatement.java:421
+#: org/postgresql/jdbc/PgPreparedStatement.java:1164
+#: org/postgresql/jdbc/PgPreparedStatement.java:1472
 #, java-format
 msgid "Invalid stream length {0}."
 msgstr "無效的串流長度 {0}."
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:411
+#: org/postgresql/jdbc/PgPreparedStatement.java:393
 #, java-format
 msgid "The JVM claims not to support the {0} encoding."
 msgstr "JVM 聲明並不支援 {0} 編碼。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:414
+#: org/postgresql/jdbc/PgPreparedStatement.java:396
 #: org/postgresql/jdbc/PgResultSet.java:1122
 #: org/postgresql/jdbc/PgResultSet.java:1156
 msgid "Provided InputStream failed."
 msgstr "提供的 InputStream 已失敗。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:460
-#: org/postgresql/jdbc/PgPreparedStatement.java:1096
+#: org/postgresql/jdbc/PgPreparedStatement.java:442
+#: org/postgresql/jdbc/PgPreparedStatement.java:1069
 #, java-format
 msgid "Unknown type {0}."
 msgstr "不明的型別 {0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:477
+#: org/postgresql/jdbc/PgPreparedStatement.java:459
 msgid "No hstore extension installed."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:619
-#: org/postgresql/jdbc/PgPreparedStatement.java:642
-#: org/postgresql/jdbc/PgPreparedStatement.java:652
-#: org/postgresql/jdbc/PgPreparedStatement.java:664
+#: org/postgresql/jdbc/PgPreparedStatement.java:601
+#: org/postgresql/jdbc/PgPreparedStatement.java:624
+#: org/postgresql/jdbc/PgPreparedStatement.java:634
+#: org/postgresql/jdbc/PgPreparedStatement.java:646
 #, java-format
 msgid "Cannot cast an instance of {0} to type {1}"
 msgstr "不能轉換一個 {0} 實例到型別 {1}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:682
+#: org/postgresql/jdbc/PgPreparedStatement.java:664
 #, java-format
 msgid "Unsupported Types value: {0}"
 msgstr "未被支持的型別值：{0}"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:894
+#: org/postgresql/jdbc/PgPreparedStatement.java:876
 #, java-format
 msgid "Cannot convert an instance of {0} to type {1}"
 msgstr "無法轉換 {0} 到類型 {1} 的實例"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:968
+#: org/postgresql/jdbc/PgPreparedStatement.java:950
 #, java-format
 msgid ""
 "Can''t infer the SQL type to use for an instance of {0}. Use setObject() "
 "with an explicit Types value to specify the type to use."
 msgstr ""
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1133
-#: org/postgresql/jdbc/PgPreparedStatement.java:1233
+#: org/postgresql/jdbc/PgPreparedStatement.java:1106
+#: org/postgresql/jdbc/PgPreparedStatement.java:1206
 msgid "Unexpected error writing large object to database."
 msgstr "將大型物件(large object)寫入資料庫時發生不明錯誤。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1178
+#: org/postgresql/jdbc/PgPreparedStatement.java:1151
 #: org/postgresql/jdbc/PgResultSet.java:1210
 msgid "Provided Reader failed."
 msgstr "提供的 Reader 已失敗。"
 
-#: org/postgresql/jdbc/PgPreparedStatement.java:1449
+#: org/postgresql/jdbc/PgPreparedStatement.java:1431
 #: org/postgresql/util/StreamWrapper.java:56
 msgid "Object is too large to send over the protocol."
 msgstr ""
@@ -1032,8 +1038,8 @@
 #: org/postgresql/jdbc/PgResultSet.java:556
 #: org/postgresql/jdbc/PgResultSet.java:594
 #: org/postgresql/jdbc/PgResultSet.java:624
-#: org/postgresql/jdbc/PgResultSet.java:3014
-#: org/postgresql/jdbc/PgResultSet.java:3058
+#: org/postgresql/jdbc/PgResultSet.java:3012
+#: org/postgresql/jdbc/PgResultSet.java:3057
 #, fuzzy, java-format
 msgid "Cannot convert the column of type {0} to requested type {1}."
 msgstr "無法轉換 {0} 到類型 {1} 的實例"
@@ -1045,7 +1051,7 @@
 msgstr "不能在新增的資料列上使用相對位置 move 方法。"
 
 #: org/postgresql/jdbc/PgResultSet.java:878
-#: org/postgresql/jdbc/PgStatement.java:895
+#: org/postgresql/jdbc/PgStatement.java:900
 #, java-format
 msgid "Invalid fetch direction constant: {0}."
 msgstr "無效的 fetch 方向常數：{0}。"
@@ -1084,8 +1090,8 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:1119
 #: org/postgresql/jdbc/PgResultSet.java:1754
-#: org/postgresql/jdbc/PgResultSet.java:2422
-#: org/postgresql/jdbc/PgResultSet.java:2443
+#: org/postgresql/jdbc/PgResultSet.java:2420
+#: org/postgresql/jdbc/PgResultSet.java:2441
 #, java-format
 msgid "The JVM claims not to support the encoding: {0}"
 msgstr "JVM 聲明並不支援編碼：{0} 。"
@@ -1099,7 +1105,7 @@
 msgstr "不能在新增的資料列上呼叫 deleteRow()。"
 
 #: org/postgresql/jdbc/PgResultSet.java:1335
-#: org/postgresql/jdbc/PgResultSet.java:3075
+#: org/postgresql/jdbc/PgResultSet.java:3074
 msgid ""
 "Cannot update the ResultSet because it is either before the start or after "
 "the end of the results."
@@ -1116,27 +1122,27 @@
 
 #: org/postgresql/jdbc/PgResultSet.java:2017
 #: org/postgresql/jdbc/PgResultSet.java:2022
-#: org/postgresql/jdbc/PgResultSet.java:2809
-#: org/postgresql/jdbc/PgResultSet.java:2815
-#: org/postgresql/jdbc/PgResultSet.java:2840
-#: org/postgresql/jdbc/PgResultSet.java:2846
-#: org/postgresql/jdbc/PgResultSet.java:2870
-#: org/postgresql/jdbc/PgResultSet.java:2875
-#: org/postgresql/jdbc/PgResultSet.java:2891
-#: org/postgresql/jdbc/PgResultSet.java:2912
-#: org/postgresql/jdbc/PgResultSet.java:2923
-#: org/postgresql/jdbc/PgResultSet.java:2936
-#: org/postgresql/jdbc/PgResultSet.java:3063
+#: org/postgresql/jdbc/PgResultSet.java:2807
+#: org/postgresql/jdbc/PgResultSet.java:2813
+#: org/postgresql/jdbc/PgResultSet.java:2838
+#: org/postgresql/jdbc/PgResultSet.java:2844
+#: org/postgresql/jdbc/PgResultSet.java:2868
+#: org/postgresql/jdbc/PgResultSet.java:2873
+#: org/postgresql/jdbc/PgResultSet.java:2889
+#: org/postgresql/jdbc/PgResultSet.java:2910
+#: org/postgresql/jdbc/PgResultSet.java:2921
+#: org/postgresql/jdbc/PgResultSet.java:2934
+#: org/postgresql/jdbc/PgResultSet.java:3062
 #, java-format
 msgid "Bad value for type {0} : {1}"
 msgstr "不良的型別值 {0} : {1}"
 
-#: org/postgresql/jdbc/PgResultSet.java:2595
+#: org/postgresql/jdbc/PgResultSet.java:2593
 #, java-format
 msgid "The column name {0} was not found in this ResultSet."
 msgstr "ResultSet 中找不到欄位名稱 {0}。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2731
+#: org/postgresql/jdbc/PgResultSet.java:2729
 msgid ""
 "ResultSet is not updateable.  The query that generated this result set must "
 "select only one table, and must select all primary keys from that table. See "
@@ -1145,42 +1151,42 @@
 "不可更新的 ResultSet。用來產生這個 ResultSet 的 SQL 命令只能操作一個資料表，"
 "並且必需選擇所有主鍵欄位，詳細請參閱 JDBC 2.1 API 規格書 5.6 節。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2743
+#: org/postgresql/jdbc/PgResultSet.java:2741
 msgid "This ResultSet is closed."
 msgstr "這個 ResultSet 已經被關閉。"
 
-#: org/postgresql/jdbc/PgResultSet.java:2774
+#: org/postgresql/jdbc/PgResultSet.java:2772
 msgid "ResultSet not positioned properly, perhaps you need to call next."
 msgstr "查詢結果指標位置不正確，您也許需要呼叫 ResultSet 的 next() 方法。"
 
-#: org/postgresql/jdbc/PgResultSet.java:3095
+#: org/postgresql/jdbc/PgResultSet.java:3094
 #, fuzzy
 msgid "Invalid UUID data."
 msgstr "無效的旗標"
 
-#: org/postgresql/jdbc/PgResultSet.java:3184
-#: org/postgresql/jdbc/PgResultSet.java:3191
-#: org/postgresql/jdbc/PgResultSet.java:3202
-#: org/postgresql/jdbc/PgResultSet.java:3213
-#: org/postgresql/jdbc/PgResultSet.java:3224
-#: org/postgresql/jdbc/PgResultSet.java:3235
-#: org/postgresql/jdbc/PgResultSet.java:3246
-#: org/postgresql/jdbc/PgResultSet.java:3257
-#: org/postgresql/jdbc/PgResultSet.java:3268
-#: org/postgresql/jdbc/PgResultSet.java:3275
-#: org/postgresql/jdbc/PgResultSet.java:3282
-#: org/postgresql/jdbc/PgResultSet.java:3293
-#: org/postgresql/jdbc/PgResultSet.java:3310
-#: org/postgresql/jdbc/PgResultSet.java:3317
-#: org/postgresql/jdbc/PgResultSet.java:3324
-#: org/postgresql/jdbc/PgResultSet.java:3335
-#: org/postgresql/jdbc/PgResultSet.java:3342
-#: org/postgresql/jdbc/PgResultSet.java:3349
-#: org/postgresql/jdbc/PgResultSet.java:3387
-#: org/postgresql/jdbc/PgResultSet.java:3394
-#: org/postgresql/jdbc/PgResultSet.java:3401
-#: org/postgresql/jdbc/PgResultSet.java:3421
-#: org/postgresql/jdbc/PgResultSet.java:3434
+#: org/postgresql/jdbc/PgResultSet.java:3183
+#: org/postgresql/jdbc/PgResultSet.java:3190
+#: org/postgresql/jdbc/PgResultSet.java:3201
+#: org/postgresql/jdbc/PgResultSet.java:3212
+#: org/postgresql/jdbc/PgResultSet.java:3223
+#: org/postgresql/jdbc/PgResultSet.java:3234
+#: org/postgresql/jdbc/PgResultSet.java:3245
+#: org/postgresql/jdbc/PgResultSet.java:3256
+#: org/postgresql/jdbc/PgResultSet.java:3267
+#: org/postgresql/jdbc/PgResultSet.java:3274
+#: org/postgresql/jdbc/PgResultSet.java:3281
+#: org/postgresql/jdbc/PgResultSet.java:3292
+#: org/postgresql/jdbc/PgResultSet.java:3309
+#: org/postgresql/jdbc/PgResultSet.java:3316
+#: org/postgresql/jdbc/PgResultSet.java:3323
+#: org/postgresql/jdbc/PgResultSet.java:3334
+#: org/postgresql/jdbc/PgResultSet.java:3341
+#: org/postgresql/jdbc/PgResultSet.java:3348
+#: org/postgresql/jdbc/PgResultSet.java:3386
+#: org/postgresql/jdbc/PgResultSet.java:3393
+#: org/postgresql/jdbc/PgResultSet.java:3400
+#: org/postgresql/jdbc/PgResultSet.java:3420
+#: org/postgresql/jdbc/PgResultSet.java:3433
 #, fuzzy, java-format
 msgid "conversion to {0} from {1} not supported"
 msgstr "不支援交易隔絕等級 {0} 。"
@@ -1246,33 +1252,33 @@
 msgid "Maximum number of rows must be a value grater than or equal to 0."
 msgstr "最大資料讀取筆數必須大於或等於 0。"
 
-#: org/postgresql/jdbc/PgStatement.java:550
+#: org/postgresql/jdbc/PgStatement.java:555
 msgid "Query timeout must be a value greater than or equals to 0."
 msgstr "查詢逾時等候時間必須大於或等於 0。"
 
-#: org/postgresql/jdbc/PgStatement.java:590
+#: org/postgresql/jdbc/PgStatement.java:595
 msgid "The maximum field size must be a value greater than or equal to 0."
 msgstr "最大欄位容量必須大於或等於 0。"
 
-#: org/postgresql/jdbc/PgStatement.java:689
+#: org/postgresql/jdbc/PgStatement.java:694
 msgid "This statement has been closed."
 msgstr "這個 statement 已經被關閉。"
 
-#: org/postgresql/jdbc/PgStatement.java:1145
-#: org/postgresql/jdbc/PgStatement.java:1173
+#: org/postgresql/jdbc/PgStatement.java:1150
+#: org/postgresql/jdbc/PgStatement.java:1178
 msgid "Returning autogenerated keys by column index is not supported."
 msgstr ""
 
-#: org/postgresql/jdbc/TimestampUtils.java:355
-#: org/postgresql/jdbc/TimestampUtils.java:423
+#: org/postgresql/jdbc/TimestampUtils.java:365
+#: org/postgresql/jdbc/TimestampUtils.java:433
 #, fuzzy, java-format
 msgid "Bad value for type timestamp/date/time: {1}"
 msgstr "不良的型別值 {0} : {1}"
 
-#: org/postgresql/jdbc/TimestampUtils.java:858
-#: org/postgresql/jdbc/TimestampUtils.java:915
-#: org/postgresql/jdbc/TimestampUtils.java:961
-#: org/postgresql/jdbc/TimestampUtils.java:1010
+#: org/postgresql/jdbc/TimestampUtils.java:914
+#: org/postgresql/jdbc/TimestampUtils.java:971
+#: org/postgresql/jdbc/TimestampUtils.java:1017
+#: org/postgresql/jdbc/TimestampUtils.java:1066
 #, fuzzy, java-format
 msgid "Unsupported binary encoding of {0}."
 msgstr "未被支持的型別值：{0}"
@@ -1285,31 +1291,31 @@
 msgid "Invalid or unsupported by client SCRAM mechanisms"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:117
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:119
 #, fuzzy, java-format
 msgid "Invalid server-first-message: {0}"
 msgstr "無效的串流長度 {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:147
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:151
 #, fuzzy, java-format
 msgid "Invalid server-final-message: {0}"
 msgstr "無效的串流長度 {0}."
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:153
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:157
 #, java-format
 msgid "SCRAM authentication failed, server returned error: {0}"
 msgstr ""
 
-#: org/postgresql/jre8/sasl/ScramAuthenticator.java:160
+#: org/postgresql/jre8/sasl/ScramAuthenticator.java:164
 msgid "Invalid server SCRAM signature"
 msgstr ""
 
-#: org/postgresql/largeobject/LargeObjectManager.java:144
+#: org/postgresql/largeobject/LargeObjectManager.java:136
 msgid "Failed to initialize LargeObject API"
 msgstr "初始化 LargeObject API 失敗"
 
-#: org/postgresql/largeobject/LargeObjectManager.java:262
-#: org/postgresql/largeobject/LargeObjectManager.java:305
+#: org/postgresql/largeobject/LargeObjectManager.java:254
+#: org/postgresql/largeobject/LargeObjectManager.java:295
 msgid "Large Objects may not be used in auto-commit mode."
 msgstr "大型物件無法被使用在自動確認事物交易模式。"
 
@@ -1343,34 +1349,34 @@
 msgid "The hostname {0} could not be verified."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:164
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:90
 msgid "The sslfactoryarg property may not be empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:180
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:106
 msgid ""
 "The environment variable containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:188
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:114
 msgid ""
 "The system property containing the server's SSL certificate must not be "
 "empty."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:195
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:121
 msgid ""
 "The sslfactoryarg property must start with the prefix file:, classpath:, "
 "env:, sys:, or -----BEGIN CERTIFICATE-----."
 msgstr ""
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:207
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:133
 #, fuzzy
 msgid "An error occurred reading the certificate"
 msgstr "進行 SSL 連線時發生錯誤。"
 
-#: org/postgresql/ssl/SingleCertValidatingFactory.java:240
+#: org/postgresql/ssl/SingleCertValidatingFactory.java:166
 msgid "No X509TrustManager found"
 msgstr ""
 
@@ -1505,31 +1511,31 @@
 "setSavePoint not allowed while an XA transaction is active."
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:177
-#: org/postgresql/xa/PGXAConnection.java:253
-#: org/postgresql/xa/PGXAConnection.java:347
+#: org/postgresql/xa/PGXAConnection.java:186
+#: org/postgresql/xa/PGXAConnection.java:272
+#: org/postgresql/xa/PGXAConnection.java:381
 #, java-format
 msgid "Invalid flags {0}"
 msgstr "無效的旗標 {0}"
 
-#: org/postgresql/xa/PGXAConnection.java:181
-#: org/postgresql/xa/PGXAConnection.java:257
-#: org/postgresql/xa/PGXAConnection.java:449
+#: org/postgresql/xa/PGXAConnection.java:190
+#: org/postgresql/xa/PGXAConnection.java:276
+#: org/postgresql/xa/PGXAConnection.java:491
 msgid "xid must not be null"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:185
+#: org/postgresql/xa/PGXAConnection.java:194
 msgid "Connection is busy with another transaction"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:194
-#: org/postgresql/xa/PGXAConnection.java:267
+#: org/postgresql/xa/PGXAConnection.java:203
+#: org/postgresql/xa/PGXAConnection.java:286
 msgid "suspend/resume not implemented"
 msgstr "暫停(suspend)/再繼續(resume)尚未被實作。"
 
-#: org/postgresql/xa/PGXAConnection.java:202
-#: org/postgresql/xa/PGXAConnection.java:209
-#: org/postgresql/xa/PGXAConnection.java:213
+#: org/postgresql/xa/PGXAConnection.java:211
+#: org/postgresql/xa/PGXAConnection.java:218
+#: org/postgresql/xa/PGXAConnection.java:222
 #, java-format
 msgid ""
 "Invalid protocol state requested. Attempted transaction interleaving is not "
@@ -1538,97 +1544,97 @@
 "事物交易隔絕(Transaction interleaving)未被實作。xid={0}, currentXid={1}, "
 "state={2}, flags={3}"
 
-#: org/postgresql/xa/PGXAConnection.java:224
+#: org/postgresql/xa/PGXAConnection.java:233
 msgid "Error disabling autocommit"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:261
+#: org/postgresql/xa/PGXAConnection.java:280
 #, java-format
 msgid ""
 "tried to call end without corresponding start call. state={0}, start "
 "xid={1}, currentXid={2}, preparedXid={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:297
+#: org/postgresql/xa/PGXAConnection.java:326
 #, java-format
 msgid ""
 "Preparing already prepared transaction, the prepared xid {0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:300
+#: org/postgresql/xa/PGXAConnection.java:329
 #, java-format
 msgid "Current connection does not have an associated xid. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:307
+#: org/postgresql/xa/PGXAConnection.java:336
 #, java-format
 msgid ""
 "Not implemented: Prepare must be issued using the same connection that "
 "started the transaction. currentXid={0}, prepare xid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:311
+#: org/postgresql/xa/PGXAConnection.java:340
 #, java-format
 msgid "Prepare called before end. prepare xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:331
+#: org/postgresql/xa/PGXAConnection.java:360
 #, java-format
 msgid "Error preparing transaction. prepare xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:382
+#: org/postgresql/xa/PGXAConnection.java:416
 msgid "Error during recover"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:438
+#: org/postgresql/xa/PGXAConnection.java:480
 #, java-format
 msgid ""
 "Error rolling back prepared transaction. rollback xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:471
+#: org/postgresql/xa/PGXAConnection.java:521
 #, java-format
 msgid ""
 "One-phase commit called for xid {0} but connection was prepared with xid {1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:479
+#: org/postgresql/xa/PGXAConnection.java:529
 msgid ""
 "Not implemented: one-phase commit must be issued using the same connection "
 "that was used to start it"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:483
+#: org/postgresql/xa/PGXAConnection.java:533
 #, java-format
 msgid "One-phase commit with unknown xid. commit xid={0}, currentXid={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:487
+#: org/postgresql/xa/PGXAConnection.java:537
 #, java-format
 msgid "commit called before end. commit xid={0}, state={1}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:498
+#: org/postgresql/xa/PGXAConnection.java:548
 #, java-format
 msgid "Error during one-phase commit. commit xid={0}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:517
+#: org/postgresql/xa/PGXAConnection.java:576
 msgid ""
 "Not implemented: 2nd phase commit must be issued using an idle connection. "
 "commit xid={0}, currentXid={1}, state={2], transactionState={3}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:550
+#: org/postgresql/xa/PGXAConnection.java:609
 #, java-format
 msgid ""
 "Error committing prepared transaction. commit xid={0}, preparedXid={1}, "
 "currentXid={2}"
 msgstr ""
 
-#: org/postgresql/xa/PGXAConnection.java:567
+#: org/postgresql/xa/PGXAConnection.java:626
 #, java-format
 msgid "Heuristic commit/rollback not supported. forget xid={0}"
 msgstr ""
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/util/Base64.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/util/Base64.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/util/Base64.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/util/Base64.java	2018-08-27 15:38:30.000000000 +0000
@@ -217,7 +217,7 @@
    * Encodes up to three bytes of the array <var>source</var> and writes the resulting four Base64
    * bytes to <var>destination</var>. The source and destination arrays can be manipulated anywhere
    * along their length by specifying <var>srcOffset</var> and <var>destOffset</var>. This method
-   * does not check to make sure your arrays are large enough to accomodate <var>srcOffset</var> + 3
+   * does not check to make sure your arrays are large enough to accommodate <var>srcOffset</var> + 3
    * for the <var>source</var> array or <var>destOffset</var> + 4 for the <var>destination</var>
    * array. The actual number of significant bytes in your array is given by <var>numSigBytes</var>.
    *
@@ -403,7 +403,7 @@
    * Decodes four bytes from array <var>source</var> and writes the resulting bytes (up to three of
    * them) to <var>destination</var>. The source and destination arrays can be manipulated anywhere
    * along their length by specifying <var>srcOffset</var> and <var>destOffset</var>. This method
-   * does not check to make sure your arrays are large enough to accomodate <var>srcOffset</var> + 4
+   * does not check to make sure your arrays are large enough to accommodate <var>srcOffset</var> + 4
    * for the <var>source</var> array or <var>destOffset</var> + 3 for the <var>destination</var>
    * array. This method returns the actual number of bytes that were converted from the Base64
    * encoding.
diff -Nru libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java
--- libpgjava-42.2.4/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java	2018-08-27 15:38:30.000000000 +0000
@@ -21,7 +21,7 @@
    * single String argument is searched if it fails, or tryString is true a no argument constructor
    * is tried.
    *
-   * @param classname Nam of the class to instantiate
+   * @param classname name of the class to instantiate
    * @param info parameter to pass as Properties
    * @param tryString weather to look for a single String argument constructor
    * @param stringarg parameter to pass as String
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -260,7 +260,7 @@
         // Seven-byte illegal sequences
         {(byte) 0xfe}, // Can't have a seven-byte sequence.
 
-        // Eigth-byte illegal sequences
+        // Eighth-byte illegal sequences
         {(byte) 0xff}, // Can't have an eight-byte sequence.
     };
 
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -9,6 +9,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+import org.postgresql.PGConnection;
 import org.postgresql.PGNotification;
 import org.postgresql.core.ServerVersion;
 import org.postgresql.test.TestUtil;
@@ -41,7 +42,7 @@
     stmt.executeUpdate("LISTEN mynotification");
     stmt.executeUpdate("NOTIFY mynotification");
 
-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications();
+    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications();
     assertNotNull(notifications);
     assertEquals(1, notifications.length);
     assertEquals("mynotification", notifications[0].getName());
@@ -60,7 +61,7 @@
     stmt.executeUpdate("LISTEN mynotification");
     stmt.executeUpdate("NOTIFY mynotification, 'message'");
 
-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications();
+    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications();
     assertNotNull(notifications);
     assertEquals(1, notifications.length);
     assertEquals("mynotification", notifications[0].getName());
@@ -83,13 +84,14 @@
     try {
       int retries = 20;
       while (retries-- > 0
-        && (notifications = ((org.postgresql.PGConnection) conn).getNotifications()) == null ) {
+        && (notifications = conn.unwrap(PGConnection.class).getNotifications()) == null ) {
         Thread.sleep(100);
       }
     } catch (InterruptedException ie) {
     }
 
-    assertNotNull(notifications);
+    assertNotNull("Notification is expected to be delivered when subscription was created"
+            + " before sending notification", notifications);
     assertEquals(1, notifications.length);
     assertEquals("mynotification", notifications[0].getName());
     assertEquals("", notifications[0].getParameter());
@@ -108,10 +110,10 @@
 
     // Here we let the getNotifications() timeout.
     long startMillis = System.currentTimeMillis();
-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(500);
+    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(500);
     long endMillis = System.currentTimeMillis();
     long runtime = endMillis - startMillis;
-    assertNull("There have been notifications, althought none have been expected.",notifications);
+    assertNull("There have been notifications, although none have been expected.",notifications);
     Assert.assertTrue("We didn't wait long enough! runtime=" + runtime, runtime > 450);
 
     stmt.close();
@@ -126,7 +128,7 @@
     // listen for notifications
     connectAndNotify("mynotification");
 
-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(10000);
+    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(10000);
     assertNotNull(notifications);
     assertEquals(1, notifications.length);
     assertEquals("mynotification", notifications[0].getName());
@@ -143,7 +145,7 @@
     // Now we check the case where notifications are already available while we are waiting forever
     connectAndNotify("mynotification");
 
-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(0);
+    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(0);
     assertNotNull(notifications);
     assertEquals(1, notifications.length);
     assertEquals("mynotification", notifications[0].getName());
@@ -169,7 +171,7 @@
       }
     }).start();
 
-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(10000);
+    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(10000);
     assertNotNull(notifications);
     assertEquals(1, notifications.length);
     assertEquals("mynotification", notifications[0].getName());
@@ -195,7 +197,7 @@
       }
     }).start();
 
-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(0);
+    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(0);
     assertNotNull(notifications);
     assertEquals(1, notifications.length);
     assertEquals("mynotification", notifications[0].getName());
@@ -226,10 +228,10 @@
     }).start();
 
     try {
-      ((org.postgresql.PGConnection) conn).getNotifications(40000);
+      conn.unwrap(PGConnection.class).getNotifications(40000);
       Assert.fail("The getNotifications(...) call didn't return when the socket closed.");
     } catch (SQLException e) {
-      // We expected thta
+      // We expected that
     }
 
     stmt.close();
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -157,7 +157,7 @@
   /**
    * Makes sure that if you get two connection wrappers from the same PooledConnection, they are
    * different, even though the represent the same physical connection. See JDBC 2.0 Optional
-   * Pacakge spec section 6.2.2
+   * Package spec section 6.2.2
    */
   @Test
   public void testPoolNewWrapper() {
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -257,6 +257,25 @@
   }
 
   @Test
+  public void testBinds() throws SQLException {
+    // braces around (42) are required to puzzle the parser
+    String query = "INSERT INTO inttable(a) VALUES (?);SELECT (42)";
+    PreparedStatement ps = con.prepareStatement(query);
+    ps.setInt(1, 100500);
+    ps.execute();
+    ResultSet rs = ps.getResultSet();
+    Assert.assertNull("insert produces no results ==> getResultSet should be null", rs);
+    Assert.assertTrue("There are two statements => getMoreResults should be true", ps.getMoreResults());
+    rs = ps.getResultSet();
+    Assert.assertNotNull("select produces results ==> getResultSet should be not null", rs);
+    Assert.assertTrue("select produces 1 row ==> rs.next should be true", rs.next());
+    Assert.assertEquals("second result of query " + query, 42, rs.getInt(1));
+
+    TestUtil.closeQuietly(rs);
+    TestUtil.closeQuietly(ps);
+  }
+
+  @Test
   public void testSetNull() throws SQLException {
     // valid: fully qualified type to setNull()
     PreparedStatement pstmt = con.prepareStatement("INSERT INTO texttable (te) VALUES (?)");
@@ -1228,7 +1247,7 @@
 
   /**
    * When we have parameters of unknown type and it's not using the unnamed statement, we issue a
-   * protocol level statment describe message for the V3 protocol. This test just makes sure that
+   * protocol level statement describe message for the V3 protocol. This test just makes sure that
    * works.
    */
   @Test
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -19,6 +19,7 @@
 
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -72,6 +73,15 @@
     con.close();
   }
 
+  private void assumeLongTest() {
+    // Run the test:
+    //   Travis: in PG_VERSION=HEAD
+    //   Other: always
+    if ("true".equals(System.getenv("TRAVIS"))) {
+      Assume.assumeTrue("HEAD".equals(System.getenv("PG_VERSION")));
+    }
+  }
+
   @Test
   public void testClose() throws SQLException {
     Statement stmt = con.createStatement();
@@ -712,6 +722,8 @@
    */
   @Test
   public void testShortQueryTimeout() throws SQLException {
+    assumeLongTest();
+
     long deadLine = System.currentTimeMillis() + 10000;
     Statement stmt = con.createStatement();
     ((PgStatement) stmt).setQueryTimeoutMs(1);
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc3/CompositeQueryParseTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc3/CompositeQueryParseTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc3/CompositeQueryParseTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc3/CompositeQueryParseTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -126,6 +126,20 @@
     assertEquals("This is a delete command", SqlCommandType.DELETE, query.command.getType());
   }
 
+  @Test
+  public void testMultiQueryWithBind() throws SQLException {
+    // braces around (42) are required to puzzle the parser
+    String sql = "INSERT INTO inttable(a) VALUES (?);SELECT (42)";
+    List<NativeQuery> queries = Parser.parseJdbcSql(sql, true, true, true,true);
+    NativeQuery query = queries.get(0);
+    assertEquals("query(0) of " + sql,
+        "INSERT: INSERT INTO inttable(a) VALUES ($1)",
+        query.command.getType() + ": " + query.nativeSql);
+    query = queries.get(1);
+    assertEquals("query(1) of " + sql,
+        "SELECT: SELECT (42)",
+        query.command.getType() + ": " + query.nativeSql);
+  }
 
   @Test
   public void testMove() throws SQLException {
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java	2018-08-27 15:38:30.000000000 +0000
@@ -24,7 +24,6 @@
         BinaryStreamTest.class,
         CharacterStreamTest.class,
         UUIDTest.class,
-        LibPQFactoryHostNameTest.class,
         XmlTest.class
 })
 public class Jdbc4TestSuite {
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc4/LibPQFactoryHostNameTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc4/LibPQFactoryHostNameTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/jdbc4/LibPQFactoryHostNameTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/jdbc4/LibPQFactoryHostNameTest.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2017, PostgreSQL Global Development Group
- * See the LICENSE file in the project root for more information.
- */
-
-package org.postgresql.test.jdbc4;
-
-import org.postgresql.ssl.jdbc4.LibPQFactory;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-
-@RunWith(Parameterized.class)
-public class LibPQFactoryHostNameTest {
-
-  private final String hostname;
-  private final String pattern;
-  private final boolean expected;
-
-  public LibPQFactoryHostNameTest(String hostname, String pattern, boolean expected) {
-    this.hostname = hostname;
-    this.pattern = pattern;
-    this.expected = expected;
-  }
-
-  @Parameterized.Parameters(name = "host={0}, pattern={1}")
-  public static Iterable<Object[]> data() {
-    return Arrays.asList(new Object[][]{
-        {"host.com", "pattern.com", false},
-        {"host.com", ".pattern.com", false},
-        {"host.com", "*.pattern.com", false},
-        {"host.com", "*.host.com", false},
-        {"a.com", "*.host.com", false},
-        {".a.com", "*.host.com", false},
-        {"longhostname.com", "*.com", true},
-        {"longhostname.ru", "*.com", false},
-        {"host.com", "host.com", true},
-        {"sub.host.com", "host.com", false},
-        {"sub.host.com", "sub.host.com", true},
-        {"sub.host.com", "*.host.com", true},
-        {"Sub.host.com", "sub.host.com", true},
-        {"sub.host.com", "Sub.host.com", true},
-        {"sub.host.com", "*.hoSt.com", true},
-        {"*.host.com", "host.com", false},
-        {"sub.sub.host.com", "*.host.com", false}, // Wildcard should cover just one level
-    });
-  }
-
-  @Test
-  public void checkPattern() throws Exception {
-    Assert.assertEquals(expected, LibPQFactory.verifyHostName(hostname, pattern));
-  }
-}
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/CommonNameVerifierTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/CommonNameVerifierTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/CommonNameVerifierTest.java	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/CommonNameVerifierTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.test.ssl;
+
+import org.postgresql.ssl.PGjdbcHostnameVerifier;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+@RunWith(Parameterized.class)
+public class CommonNameVerifierTest {
+
+  private final String a;
+  private final String b;
+  private final int expected;
+
+  public CommonNameVerifierTest(String a, String b, int expected) {
+    this.a = a;
+    this.b = b;
+    this.expected = expected;
+  }
+
+  @Parameterized.Parameters(name = "a={0}, b={1}")
+  public static Iterable<Object[]> data() {
+    return Arrays.asList(new Object[][]{
+        {"com", "host.com", -1},
+        {"*.com", "host.com", -1},
+        {"*.com", "*.*.com", -1},
+        {"**.com", "*.com", -1},
+        {"a.com", "*.host.com", -1},
+        {"host.com", "subhost.host.com", -1},
+        {"host.com", "host.com", 0}
+    });
+  }
+
+  @Test
+  public void comparePatterns() throws Exception {
+    Assert.assertEquals(a + " vs " + b,
+        expected, PGjdbcHostnameVerifier.HOSTNAME_PATTERN_COMPARATOR.compare(a, b));
+
+    Assert.assertEquals(b + " vs " + a,
+        -expected, PGjdbcHostnameVerifier.HOSTNAME_PATTERN_COMPARATOR.compare(b, a));
+  }
+}
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java	1970-01-01 00:00:00.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.test.ssl;
+
+import org.postgresql.ssl.PGjdbcHostnameVerifier;
+import org.postgresql.ssl.jdbc4.LibPQFactory;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+@RunWith(Parameterized.class)
+public class LibPQFactoryHostNameTest {
+
+  private final String hostname;
+  private final String pattern;
+  private final boolean expected;
+
+  public LibPQFactoryHostNameTest(String hostname, String pattern, boolean expected) {
+    this.hostname = hostname;
+    this.pattern = pattern;
+    this.expected = expected;
+  }
+
+  @Parameterized.Parameters(name = "host={0}, pattern={1}")
+  public static Iterable<Object[]> data() {
+    return Arrays.asList(new Object[][]{
+        {"host.com", "pattern.com", false},
+        {"host.com", ".pattern.com", false},
+        {"host.com", "*.pattern.com", false},
+        {"host.com", "*.host.com", false},
+        {"a.com", "*.host.com", false},
+        {".a.com", "*.host.com", false},
+        {"longhostname.com", "*.com", true},
+        {"longhostname.ru", "*.com", false},
+        {"host.com", "host.com", true},
+        {"sub.host.com", "host.com", false},
+        {"sub.host.com", "sub.host.com", true},
+        {"sub.host.com", "*.host.com", true},
+        {"Sub.host.com", "sub.host.com", true},
+        {"sub.host.com", "Sub.host.com", true},
+        {"sub.host.com", "*.hoSt.com", true},
+        {"*.host.com", "host.com", false},
+        {"sub.sub.host.com", "*.host.com", false}, // Wildcard should cover just one level
+        {"com", "*", false}, // Wildcard should have al least one dot
+    });
+  }
+
+  @Test
+  public void checkPattern() throws Exception {
+    Assert.assertEquals(hostname + ", pattern: " + pattern,
+        expected, LibPQFactory.verifyHostName(hostname, pattern));
+
+    Assert.assertEquals(hostname + ", pattern: " + pattern,
+        expected, PGjdbcHostnameVerifier.INSTANCE.verifyHostName(hostname, pattern));
+  }
+}
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTestSuite.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTestSuite.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTestSuite.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTestSuite.java	2018-08-27 15:38:30.000000000 +0000
@@ -33,7 +33,7 @@
   private static String IS_ENABLED_PROP_NAME = "testsinglecertfactory";
 
   /**
-   * <p>This method returns the paramaters that JUnit will use when constructing this class for
+   * <p>This method returns the parameters that JUnit will use when constructing this class for
    * testing. It returns a collection of arrays, each containing a single value for the JDBC URL to
    * test against.</p>
    *
@@ -97,7 +97,7 @@
   }
 
   /**
-   * Helper method to create a connection using the additional properites specified in the "info"
+   * Helper method to create a connection using the additional properties specified in the "info"
    * paramater.
    *
    * @param info The additional properties to use when creating a connection
@@ -279,7 +279,7 @@
    * <p>Connect using SSL and attempt to validate the server's certificate against the proper pre
    * shared certificate. The certificate is specified as an environment variable.</p>
    *
-   * <p>Note: To execute this test succesfully you need to set the value of the environment variable
+   * <p>Note: To execute this test successfully you need to set the value of the environment variable
    * DATASOURCE_SSL_CERT prior to running the test.</p>
    *
    * <p>Here's one way to do it: $ DATASOURCE_SSL_CERT=$(cat certdir/goodroot.crt) ant clean test</p>
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java	2018-08-27 15:38:30.000000000 +0000
@@ -1,336 +1,481 @@
 /*
- * Copyright (c) 2004, PostgreSQL Global Development Group
+ * Copyright (c) 2018, PostgreSQL Global Development Group
  * See the LICENSE file in the project root for more information.
  */
 
 package org.postgresql.test.ssl;
 
+import org.postgresql.PGProperty;
+import org.postgresql.jdbc.SslMode;
 import org.postgresql.test.TestUtil;
+import org.postgresql.test.jdbc2.BaseTest4;
+import org.postgresql.util.PSQLState;
 
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
+import java.io.FileNotFoundException;
+import java.net.SocketException;
+import java.security.cert.CertPathValidatorException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Properties;
-import java.util.TreeMap;
+import javax.net.ssl.SSLHandshakeException;
 
-public class SslTest extends TestCase {
+@RunWith(Parameterized.class)
+public class SslTest extends BaseTest4 {
+  enum Hostname {
+    GOOD("localhost"),
+    BAD("127.0.0.1"),
+    ;
 
-  /**
-   * Tries to connect to the database.
-   *
-   * @param connstr Connection string for the database
-   * @param expected Expected values. the first element is a String holding the expected message of
-   *        PSQLException or null, if no exception is expected, the second indicates weather ssl is
-   *        to be used (Boolean)
-   */
-  protected void driver(String connstr, Object[] expected) throws SQLException {
-    Connection conn = null;
-    String exmsg = (String) expected[0];
+    final String value;
+
+    Hostname(String value) {
+      this.value = value;
+    }
+  }
+
+  enum TestDatabase {
+    hostdb,
+    hostnossldb,
+    hostssldb,
+    hostsslcertdb,
+    certdb,
+    ;
+
+    public static final TestDatabase[] VALUES = values();
+
+    public boolean requiresClientCert() {
+      return this == certdb || this == hostsslcertdb;
+    }
+
+    public boolean requiresSsl() {
+      return this == certdb || this == hostssldb || this == hostsslcertdb;
+    }
+
+    public boolean rejectsSsl() {
+      return this == hostnossldb;
+    }
+  }
+
+  enum ClientCertificate {
+    EMPTY(""),
+    GOOD("goodclient"),
+    BAD("badclient"),
+    ;
+
+    public static final ClientCertificate[] VALUES = values();
+    public final String fileName;
+
+    ClientCertificate(String fileName) {
+      this.fileName = fileName;
+    }
+  }
+
+  enum ClientRootCertificate {
+    EMPTY(""),
+    GOOD("goodroot"),
+    BAD("badroot"),
+    ;
+
+    public static final ClientRootCertificate[] VALUES = values();
+    public final String fileName;
+
+    ClientRootCertificate(String fileName) {
+      this.fileName = fileName;
+    }
+  }
+
+  @Parameterized.Parameter(0)
+  public Hostname host;
+
+  @Parameterized.Parameter(1)
+  public TestDatabase db;
+
+  @Parameterized.Parameter(2)
+  public SslMode sslmode;
+
+  @Parameterized.Parameter(3)
+  public ClientCertificate clientCertificate;
+
+  @Parameterized.Parameter(4)
+  public ClientRootCertificate clientRootCertificate;
+
+  @Parameterized.Parameter(5)
+  public String certdir;
+
+  @Parameterized.Parameters(name = "host={0}, db={1} sslMode={2}, cCert={3}, cRootCert={4}")
+  public static Iterable<Object[]> data() {
+    Properties prop = TestUtil.loadPropertyFiles("ssltest.properties");
+    String enableSslTests = prop.getProperty("enable_ssl_tests");
+    if (!Boolean.valueOf(enableSslTests)) {
+      System.out.println("enableSslTests is " + enableSslTests + ", skipping SSL tests");
+      return Collections.emptyList();
+    }
+
+    Collection<Object[]> tests = new ArrayList<Object[]>();
+
+
+    File certDirFile = TestUtil.getFile(prop.getProperty("certdir"));
+    String certdir = certDirFile.getAbsolutePath();
+
+    for (SslMode sslMode : SslMode.VALUES) {
+      for (Hostname hostname : Hostname.values()) {
+        for (TestDatabase database : TestDatabase.VALUES) {
+          for (ClientCertificate clientCertificate : ClientCertificate.VALUES) {
+            for (ClientRootCertificate rootCertificate : ClientRootCertificate.VALUES) {
+              if ((sslMode == SslMode.DISABLE
+                  || database.rejectsSsl())
+                  && (clientCertificate != ClientCertificate.GOOD
+                  || rootCertificate != ClientRootCertificate.GOOD)) {
+                // When SSL is disabled, it does not make sense to verify "bad certificates"
+                // since certificates are NOT used in plaintext connections
+                continue;
+              }
+              if (database.rejectsSsl()
+                  && (sslMode.verifyCertificate()
+                      || hostname == Hostname.BAD)
+              ) {
+                // DB would reject SSL connection, so it makes no sense to test cases like verify-full
+                continue;
+              }
+              tests.add(
+                  new Object[]{hostname, database, sslMode, clientCertificate, rootCertificate,
+                      certdir});
+            }
+          }
+        }
+      }
+    }
+
+    return tests;
+  }
+
+  @Override
+  protected void updateProperties(Properties props) {
+    super.updateProperties(props);
+    props.put(TestUtil.SERVER_HOST_PORT_PROP, host.value + ":" + TestUtil.getPort());
+    props.put(TestUtil.DATABASE_PROP, db.toString());
+    PGProperty.SSL_MODE.set(props, sslmode.value);
+    if (clientCertificate == ClientCertificate.EMPTY) {
+      PGProperty.SSL_CERT.set(props, "");
+      PGProperty.SSL_KEY.set(props, "");
+    } else {
+      PGProperty.SSL_CERT.set(props,
+          certdir + "/" + clientCertificate.fileName + ".crt");
+      PGProperty.SSL_KEY.set(props,
+          certdir + "/" + clientCertificate.fileName + ".pk8");
+    }
+    if (clientRootCertificate == ClientRootCertificate.EMPTY) {
+      PGProperty.SSL_ROOT_CERT.set(props, "");
+    } else {
+      PGProperty.SSL_ROOT_CERT.set(props,
+          certdir + "/" + clientRootCertificate.fileName + ".crt");
+    }
+  }
+
+  @Override
+  public void setUp() throws Exception {
+    SQLException e = null;
     try {
-      conn = DriverManager.getConnection(connstr, TestUtil.getUser(), TestUtil.getPassword());
-      if (exmsg != null) {
-        fail("Exception did not occur: " + exmsg);
-      }
-      //
-      ResultSet rs = conn.createStatement().executeQuery("select ssl_is_used()");
-      assertTrue(rs.next());
-      assertEquals("ssl_is_used: ", ((Boolean) expected[1]).booleanValue(), rs.getBoolean(1));
-      conn.close();
+      super.setUp();
     } catch (SQLException ex) {
-      if (conn != null) {
-        conn.close();
+      e = ex;
+    }
+
+    try {
+      // Note that checkErrorCodes throws AssertionError for unexpected cases
+      checkErrorCodes(e);
+    } catch (AssertionError ae) {
+      // Make sure original SQLException is printed as well even in case of AssertionError
+      if (e != null) {
+        ae.initCause(e);
+      }
+      throw ae;
+    }
+  }
+
+  private void assertClientCertRequired(SQLException e, String caseName) {
+    if (e == null) {
+      Assert.fail(caseName + " should result in failure of client validation");
+    }
+    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
+        PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
+  }
+
+  private void checkErrorCodes(SQLException e) {
+    if (e == null && sslmode == SslMode.ALLOW && !db.requiresSsl()) {
+      // allowed to connect with plain connection
+      return;
+    }
+
+    if (clientRootCertificate == ClientRootCertificate.EMPTY
+        && (sslmode == SslMode.VERIFY_CA || sslmode == SslMode.VERIFY_FULL)) {
+      String caseName = "rootCertificate is missing and sslmode=" + sslmode;
+      if (e == null) {
+        Assert.fail(caseName + " should result in FileNotFound exception for root certificate");
+      }
+      Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
+          PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
+      FileNotFoundException fnf = findCause(e, FileNotFoundException.class);
+      if (fnf == null) {
+        Assert.fail(caseName + " ==> FileNotFoundException should be present in getCause chain");
+      }
+      return;
+    }
+
+    if (db.requiresSsl() && sslmode == SslMode.DISABLE) {
+      String caseName = "sslmode=DISABLE and database " + db + " requires SSL";
+      if (e == null) {
+        Assert.fail(caseName + " should result in connection failure");
+      }
+      Assert.assertEquals(caseName + " ==> INVALID_AUTHORIZATION_SPECIFICATION is expected",
+          PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
+      return;
+    }
+
+    if (db.rejectsSsl() && sslmode.requireEncryption()) {
+      String caseName =
+          "database " + db + " rejects SSL, and sslmode " + sslmode + " requires encryption";
+      if (e == null) {
+        Assert.fail(caseName + " should result in connection failure");
+      }
+      Assert.assertEquals(caseName + " ==> INVALID_AUTHORIZATION_SPECIFICATION is expected",
+          PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
+      return;
+    }
+
+    // Server certificate, server hostname, and client certificate can be validated in any order
+    // So we have three validators and expect at least one of them to match
+    List<AssertionError> errors = null;
+    try {
+      if (assertServerCertificate(e)) {
+        return;
+      }
+    } catch (AssertionError ae) {
+      errors = addError(errors, ae);
+    }
+
+    try {
+      if (assertServerHostname(e)) {
+        return;
       }
-      if (exmsg == null) { // no exception is excepted
-        fail("Exception thrown: " + ex.getMessage());
+    } catch (AssertionError ae) {
+      errors = addError(errors, ae);
+    }
+
+
+    try {
+      if (assertClientCertificate(e)) {
+        return;
+      }
+    } catch (AssertionError ae) {
+      errors = addError(errors, ae);
+    }
+
+    if (sslmode == SslMode.ALLOW && db.requiresSsl()) {
+      // Allow tries to connect with non-ssl first, and it always throws the first error even after try SSL.
+      // "If SSL was expected to fail" (e.g. invalid certificate), and db requiresSsl, then ALLOW
+      // should fail as well
+      String caseName =
+          "sslmode=ALLOW and db " + db + " requires SSL, and there are expected SSL failures";
+      if (errors == null) {
+        if (e != null) {
+          Assert.fail(caseName + " ==> connection should be upgraded to SSL with no failures");
+        }
       } else {
-        assertTrue("expected: " + exmsg + " actual: " + ex.getMessage(),
-            ex.getMessage().matches(exmsg));
+        if (e == null) {
+          Assert.fail(caseName + " ==> connection should fail");
+        }
+        Assert.assertEquals(caseName + " ==> INVALID_AUTHORIZATION_SPECIFICATION is expected",
+            PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
+      }
+      // ALLOW is ok
+      return;
+    }
+
+    if (errors == null) {
+      if (e == null) {
+        // Assume "no exception" was expected.
+        // The cases like "successfully connected in sslmode=DISABLE to SSLONLY db"
+        // should be handled with assertions above
         return;
       }
+      Assert.fail("SQLException present when it was not expected");
+    }
+
+    AssertionError firstError = errors.get(0);
+    if (errors.size() == 1) {
+      throw firstError;
+    }
+
+    for (int i = 1; i < errors.size(); i++) {
+      AssertionError error = errors.get(i);
+      // addSuppressed is Java 1.7+
+      //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
+      firstError.addSuppressed(error);
+      //#endif
+      error.printStackTrace();
     }
+
+    throw firstError;
   }
 
-  protected String certdir;
-  protected String connstr;
-  protected String sslmode;
-  protected boolean goodclient;
-  protected boolean goodserver;
-  protected String prefix;
-  protected Object[] expected;
-
-  private String makeConnStr(String sslmode, boolean goodclient, boolean goodserver) {
-    return connstr
-        + "&sslmode=" + sslmode
-        + "&sslcert=" + certdir + "/" + prefix + (goodclient ? "goodclient.crt" : "badclient.crt")
-        + "&sslkey=" + certdir + "/" + prefix + (goodclient ? "goodclient.pk8" : "badclient.pk8")
-        + "&sslrootcert=" + certdir + "/" + prefix + (goodserver ? "goodroot.crt" : "badroot.crt")
-        // + "&sslfactory=org.postgresql.ssl.NonValidatingFactory"
-        + "&loglevel=" + TestUtil.getLogLevel();
-  }
-
-  public SslTest(String name, String certdir, String connstr, String sslmode,
-      boolean goodclient, boolean goodserver, String prefix, Object[] expected) {
-    super(name);
-    this.certdir = certdir;
-    this.connstr = connstr;
-    this.sslmode = sslmode;
-    this.goodclient = goodclient;
-    this.goodserver = goodserver;
-    this.prefix = prefix;
-    this.expected = expected;
+  private List<AssertionError> addError(List<AssertionError> errors, AssertionError ae) {
+    if (errors == null) {
+      errors = new ArrayList<AssertionError>();
+    }
+    errors.add(ae);
+    return errors;
   }
 
-  static TestSuite getSuite(Properties prop, String param) {
-    File certDirFile = TestUtil.getFile(prop.getProperty("certdir"));
-    String certdir = certDirFile.getAbsolutePath();
-    String sconnstr = prop.getProperty(param);
-    String sprefix = prop.getProperty(param + "prefix");
-    String[] sslModes = {"disable", "allow", "prefer", "require", "verify-ca", "verify-full"};
-
-    TestSuite suite = new TestSuite();
-    Map<String, Object[]> expected = expectedmap.get(param);
-    if (expected == null) {
-      expected = defaultexpected;
-    }
-    for (String sslMode : sslModes) {
-      suite.addTest(new SslTest(param + "-" + sslMode + "GG3", certdir, sconnstr, sslMode,
-           true, true, sprefix, expected.get(sslMode + "GG")));
-      suite.addTest(new SslTest(param + "-" + sslMode + "GB3", certdir, sconnstr, sslMode,
-           true, false, sprefix, expected.get(sslMode + "GB")));
-      suite.addTest(new SslTest(param + "-" + sslMode + "BG3", certdir, sconnstr, sslMode,
-           false, true, sprefix, expected.get(sslMode + "BG")));
-    }
-    return suite;
-  }
-
-  protected void runTest() throws Throwable {
-    driver(makeConnStr(sslmode, goodclient, goodserver), expected);
-  }
-
-  static Map<String, Map<String, Object[]>> expectedmap;
-  static TreeMap<String, Object[]> defaultexpected;
-
-  // For some strange reason, the v2 driver begins these error messages by "Connection rejected: "
-  // but the v3 does not.
-  // Also, for v2 there are two spaces after FATAL:, and the message ends with "\n.".
-  static String PG_HBA_ON =
-      "(Connection rejected: )?FATAL:  ?no pg_hba.conf entry for host .*, user .*, database .*, SSL on(?s-d:.*)";
-  static String PG_HBA_OFF =
-      "(Connection rejected: )?FATAL:  ?no pg_hba.conf entry for host .*, user .*, database .*, SSL off(?s-d:.*)";
-  static String FAILED = "The connection attempt failed.";
-  static String BROKEN =
-      "SSL error: (Broken pipe( \\(Write failed\\))?|Received fatal alert: unknown_ca|Connection reset|Protocol wrong type for socket)";
-  static String SSLMODEALLOW  = "Invalid sslmode value: allow";
-  static String SSLMODEPREFER  = "Invalid sslmode value: prefer";
-  // static String UNKNOWN = "SSL error: Broken pipe";
-  //static String UNKNOWN = "SSL error: Received fatal alert: unknown_ca";
-  static String ANY = ".*";
-  static String VALIDATOR =
-      "SSL error: sun.security.validator.ValidatorException: PKIX path (building|validation) failed:.*";
-  static String HOSTNAME = "The hostname .* could not be verified.";
-
-  static {
-    defaultexpected = new TreeMap<String, Object[]>();
-    defaultexpected.put("disableGG", new Object[]{null, Boolean.FALSE});
-    defaultexpected.put("disableGB", new Object[]{null, Boolean.FALSE});
-    defaultexpected.put("disableBG", new Object[]{null, Boolean.FALSE});
-    defaultexpected.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    defaultexpected.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    defaultexpected.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    defaultexpected.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    defaultexpected.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    defaultexpected.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    defaultexpected.put("requireGG", new Object[]{null, Boolean.TRUE});
-    defaultexpected.put("requireGB", new Object[]{null, Boolean.TRUE});
-    defaultexpected.put("requireBG", new Object[]{null, Boolean.TRUE});
-    defaultexpected.put("verify-caGG", new Object[]{null, Boolean.TRUE});
-    defaultexpected.put("verify-caGB", new Object[]{ANY, Boolean.TRUE});
-    defaultexpected.put("verify-caBG", new Object[]{null, Boolean.TRUE});
-    defaultexpected.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
-    defaultexpected.put("verify-fullGB", new Object[]{ANY, Boolean.TRUE});
-    defaultexpected.put("verify-fullBG", new Object[]{null, Boolean.TRUE});
-
-    expectedmap = new TreeMap<String, Map<String, Object[]>>();
-    TreeMap<String, Object[]> work;
-
-    work = (TreeMap) defaultexpected.clone();
-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("requireGG", new Object[]{ANY, Boolean.TRUE});
-    work.put("requireGB", new Object[]{ANY, Boolean.TRUE});
-    work.put("requireBG", new Object[]{ANY, Boolean.TRUE});
-    work.put("verify-caGG", new Object[]{ANY, Boolean.TRUE});
-    work.put("verify-caGB", new Object[]{ANY, Boolean.TRUE});
-    work.put("verify-caBG", new Object[]{ANY, Boolean.TRUE});
-    work.put("verify-fullGG", new Object[]{ANY, Boolean.TRUE});
-    work.put("verify-fullGB", new Object[]{ANY, Boolean.TRUE});
-    work.put("verify-fullBG", new Object[]{ANY, Boolean.TRUE});
-    expectedmap.put("ssloff9", work);
-
-    work = (TreeMap) defaultexpected.clone();
-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("requireGG", new Object[]{PG_HBA_ON, Boolean.TRUE});
-    work.put("requireGB", new Object[]{PG_HBA_ON, Boolean.TRUE});
-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-caGG", new Object[]{PG_HBA_ON, Boolean.TRUE});
-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-fullGG", new Object[]{PG_HBA_ON, Boolean.TRUE});
-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
-    expectedmap.put("sslhostnossl9", work);
-
-    work = (TreeMap) defaultexpected.clone();
-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
-    expectedmap.put("sslhostgh9", work);
-
-    work = (TreeMap) work.clone();
-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    expectedmap.put("sslhostsslgh9", work);
-
-    work = (TreeMap) defaultexpected.clone();
-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-fullGG", new Object[]{HOSTNAME, Boolean.TRUE});
-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
-    expectedmap.put("sslhostbh9", work);
-
-    work = (TreeMap) work.clone();
-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
-    expectedmap.put("sslhostsslbh9", work);
-
-    work = (TreeMap) defaultexpected.clone();
-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
-    expectedmap.put("sslhostsslcertgh9", work);
-
-    work = (TreeMap) defaultexpected.clone();
-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-fullGG", new Object[]{HOSTNAME, Boolean.TRUE});
-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
-    expectedmap.put("sslhostsslcertbh9", work);
-
-    work = (TreeMap) defaultexpected.clone();
-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
-    work.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
-    expectedmap.put("sslcertgh9", work);
-
-    work = (TreeMap) work.clone();
-    work.put("verify-fullGG", new Object[]{HOSTNAME, Boolean.TRUE});
-    expectedmap.put("sslcertbh9", work);
+  /**
+   * Checks server certificate validation error.
+   *
+   * @param e connection exception or null if no exception
+   * @return true when validation pass, false when the case is not applicable
+   * @throws AssertionError when exception does not match expectations
+   */
+  private boolean assertServerCertificate(SQLException e) {
+    if (clientRootCertificate == ClientRootCertificate.GOOD
+        || (sslmode != SslMode.VERIFY_CA && sslmode != SslMode.VERIFY_FULL)) {
+      return false;
+    }
 
+    String caseName = "Server certificate is " + clientRootCertificate + " + sslmode=" + sslmode;
+    if (e == null) {
+      Assert.fail(caseName + " should result in failure of server validation");
+    }
+
+    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
+        PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
+    CertPathValidatorException validatorEx = findCause(e, CertPathValidatorException.class);
+    if (validatorEx == null) {
+      Assert.fail(caseName + " ==> exception should be caused by CertPathValidatorException,"
+          + " but no CertPathValidatorException is present in the getCause chain");
+    }
+    // getReason is Java 1.7+
+    //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
+    Assert.assertEquals(caseName + " ==> CertPathValidatorException.getReason",
+        "NO_TRUST_ANCHOR", validatorEx.getReason().toString());
+    //#endif
+    return true;
+  }
+
+  /**
+   * Checks hostname validation error.
+   *
+   * @param e connection exception or null if no exception
+   * @return true when validation pass, false when the case is not applicable
+   * @throws AssertionError when exception does not match expectations
+   */
+  private boolean assertServerHostname(SQLException e) {
+    if (sslmode != SslMode.VERIFY_FULL || host != Hostname.BAD) {
+      return false;
+    }
+
+    String caseName = "VERIFY_FULL + hostname that does not match server certificate";
+    if (e == null) {
+      Assert.fail(caseName + " ==> CONNECTION_FAILURE expected");
+    }
+    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
+        PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
+    if (!e.getMessage().contains("PgjdbcHostnameVerifier")) {
+      Assert.fail(caseName + " ==> message should contain"
+          + " 'PgjdbcHostnameVerifier'. Actual message is " + e.getMessage());
+    }
+    return true;
+  }
+
+  /**
+   * Checks client certificate validation error.
+   *
+   * @param e connection exception or null if no exception
+   * @return true when validation pass, false when the case is not applicable
+   * @throws AssertionError when exception does not match expectations
+   */
+  private boolean assertClientCertificate(SQLException e) {
+    if (db.requiresClientCert() && clientCertificate == ClientCertificate.EMPTY) {
+      String caseName =
+          "client certificate was not sent and database " + db + " requires client certificate";
+      assertClientCertRequired(e, caseName);
+      return true;
+    }
+
+    if (clientCertificate != ClientCertificate.BAD) {
+      return false;
+    }
+    // Server verifies certificate no matter how it is configured, so sending BAD one
+    // is doomed to fail
+    String caseName = "BAD client certificate, and database " + db + " requires one";
+    if (e == null) {
+      Assert.fail(caseName + " should result in failure of client validation");
+    }
+    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
+        PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
+
+    // Two exceptions are possible
+    // SSLHandshakeException: Received fatal alert: unknown_ca
+    // SocketException: broken pipe (write failed)
+
+    SocketException brokenPipe = findCause(e, SocketException.class);
+    SSLHandshakeException handshakeException = findCause(e, SSLHandshakeException.class);
+
+    if (brokenPipe == null && handshakeException == null) {
+      Assert.fail(caseName + " ==> exception should be caused by SocketException(broken pipe)"
+          + " or SSLHandshakeException. No exceptions of such kind are present in the getCause chain");
+    }
+    if (brokenPipe != null && !brokenPipe.getMessage().contains("Broken pipe")) {
+      Assert.fail(
+          caseName + " ==> server should have terminated the connection (broken pipe expected)"
+              + ", actual exception was " + brokenPipe.getMessage());
+    }
+    if (handshakeException != null && !handshakeException.getMessage().contains("unknown_ca")) {
+      Assert.fail(
+          caseName + " ==> server should have terminated the connection (expected 'unknown_ca')"
+              + ", actual exception was " + handshakeException.getMessage());
+    }
+    return true;
   }
 
+  private static <T extends Throwable> T findCause(Throwable t, Class<T> cause) {
+    while (t != null) {
+      if (cause.isInstance(t)) {
+        return (T) t;
+      }
+      t = t.getCause();
+    }
+    return null;
+  }
+
+
+  @Test
+  public void run() throws SQLException {
+    if (con == null) {
+      // e.g. expected failure to connect
+      return;
+    }
+    ResultSet rs = con.createStatement().executeQuery("select ssl_is_used()");
+    Assert.assertTrue("select ssl_is_used() should return a row", rs.next());
+    boolean sslUsed = rs.getBoolean(1);
+    if (sslmode == SslMode.ALLOW) {
+      Assert.assertEquals("ssl_is_used: ",
+          db.requiresSsl(),
+          sslUsed);
+    } else {
+      Assert.assertEquals("ssl_is_used: ",
+          sslmode != SslMode.DISABLE && !db.rejectsSsl(),
+          sslUsed);
+    }
+    TestUtil.closeQuietly(rs);
+  }
 
 }
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java	2018-08-27 15:38:30.000000000 +0000
@@ -5,43 +5,14 @@
 
 package org.postgresql.test.ssl;
 
-import org.postgresql.test.TestUtil;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-import junit.framework.TestSuite;
-
-import java.util.Properties;
-
-public class SslTestSuite extends TestSuite {
-  private static Properties prop;
-
-  private static void add(TestSuite suite, String param) {
-    if (prop.getProperty(param, "").equals("")) {
-      System.out.println("Skipping " + param + ".");
-    } else {
-      suite.addTest(SslTest.getSuite(prop, param));
-    }
-  }
-
-  /*
-   * The main entry point for JUnit
-   */
-  public static TestSuite suite() throws Exception {
-    TestSuite suite = new TestSuite();
-    prop = TestUtil.loadPropertyFiles("ssltest.properties");
-    add(suite, "ssloff9");
-    add(suite, "sslhostnossl9");
-
-    String[] hostModes = {"sslhost", "sslhostssl", "sslhostsslcert", "sslcert"};
-    String[] certModes = {"gh", "bh"};
-
-    for (String hostMode : hostModes) {
-      for (String certMode : certModes) {
-        add(suite, hostMode + certMode + "9");
-      }
-    }
-
-    TestUtil.initDriver();
-
-    return suite;
-  }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    LibPQFactoryHostNameTest.class,
+    CommonNameVerifierTest.class,
+    SslTest.class
+})
+public class SslTestSuite {
 }
diff -Nru libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java
--- libpgjava-42.2.4/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java	2018-08-27 15:38:30.000000000 +0000
@@ -33,13 +33,27 @@
  */
 public class TestUtil {
   /*
+   * The case is as follows:
+   * 1. Typically the database and hostname are taken from System.properties or build.properties or build.local.properties
+   *    That enables to override test DB via system property
+   * 2. There are tests where different DBs should be used (e.g. SSL tests), so we can't just use DB name from system property
+   *    That is why _test_ properties exist: they overpower System.properties and build.properties
+   */
+  public static final String SERVER_HOST_PORT_PROP = "_test_hostport";
+  public static final String DATABASE_PROP = "_test_database";
+
+  /*
    * Returns the Test database JDBC URL
    */
   public static String getURL() {
-    return getURL(getServer(), getPort());
+    return getURL(getServer(), + getPort());
   }
 
   public static String getURL(String server, int port) {
+    return getURL(server + ":" + port, getDatabase());
+  }
+
+  public static String getURL(String hostport, String database) {
     String logLevel = "";
     if (getLogLevel() != null && !getLogLevel().equals("")) {
       logLevel = "&loggerLevel=" + getLogLevel();
@@ -76,9 +90,8 @@
     }
 
     return "jdbc:postgresql://"
-        + server + ":"
-        + port + "/"
-        + getDatabase()
+        + hostport + "/"
+        + database
         + "?ApplicationName=Driver Tests"
         + logLevel
         + logFile
@@ -136,6 +149,13 @@
   }
 
   /*
+   * Returns password for default callbackhandler
+   */
+  public static String getSslPassword() {
+    return System.getProperty(PGProperty.SSL_PASSWORD.getName());
+  }
+
+  /*
    * Returns the user for SSPI authentication tests
    */
   public static String getSSPIUser() {
@@ -255,10 +275,10 @@
   }
 
   /**
-   * Get a connection using a priviliged user mostly for tests that the ability to load C functions
+   * Get a connection using a privileged user mostly for tests that the ability to load C functions
    * now as of 4/14.
    *
-   * @return connection using a priviliged user mostly for tests that the ability to load C
+   * @return connection using a privileged user mostly for tests that the ability to load C
    *         functions now as of 4/14
    */
   public static Connection openPrivilegedDB() throws Exception {
@@ -301,6 +321,11 @@
       password = "";
     }
     props.setProperty("password", password);
+    String sslPassword = getSslPassword();
+    if (sslPassword != null) {
+      PGProperty.SSL_PASSWORD.set(props, sslPassword);
+    }
+
     if (!props.containsKey(PGProperty.PREPARE_THRESHOLD.getName())) {
       PGProperty.PREPARE_THRESHOLD.set(props, getPrepareThreshold());
     }
@@ -310,8 +335,11 @@
         props.put(PGProperty.PREFER_QUERY_MODE.getName(), value);
       }
     }
+    // Enable Base4 tests to override host,port,database
+    String hostport = props.getProperty(SERVER_HOST_PORT_PROP, getServer() + ":" + getPort());
+    String database = props.getProperty(DATABASE_PROP, getDatabase());
 
-    return DriverManager.getConnection(getURL(), props);
+    return DriverManager.getConnection(getURL(hostport, database), props);
   }
 
   /*
@@ -782,7 +810,7 @@
 
   public static void recreateLogicalReplicationSlot(Connection connection, String slotName, String outputPlugin)
       throws SQLException, InterruptedException, TimeoutException {
-    //drop previos slot
+    //drop previous slot
     dropReplicationSlot(connection, slotName);
 
     PreparedStatement stm = null;
@@ -798,7 +826,7 @@
 
   public static void recreatePhysicalReplicationSlot(Connection connection, String slotName)
       throws SQLException, InterruptedException, TimeoutException {
-    //drop previos slot
+    //drop previous slot
     dropReplicationSlot(connection, slotName);
 
     PreparedStatement stm = null;
diff -Nru libpgjava-42.2.4/pom.xml libpgjava-42.2.5/pom.xml
--- libpgjava-42.2.4/pom.xml	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/pom.xml	2018-08-27 15:38:30.000000000 +0000
@@ -9,7 +9,7 @@
   <artifactId>pgjdbc-aggregate</artifactId>
   <packaging>pom</packaging>
   <name>PostgreSQL JDBC Driver aggregate</name>
-  <version>42.2.4</version>
+  <version>42.2.5</version>
   <description>PgJDBC aggregate project</description>
   <url>https://github.com/pgjdbc/pgjdbc</url>
 
@@ -22,7 +22,7 @@
     <url>https://github.com/pgjdbc/pgjdbc</url>
     <connection>scm:git:https://github.com/pgjdbc/pgjdbc.git</connection>
     <developerConnection>scm:git:git@github.com:pgjdbc/pgjdbc.git</developerConnection>
-    <tag>REL42.2.4</tag>
+    <tag>REL42.2.5</tag>
   </scm>
 
 </project>
diff -Nru libpgjava-42.2.4/README.md libpgjava-42.2.5/README.md
--- libpgjava-42.2.4/README.md	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/README.md	2018-08-27 15:38:30.000000000 +0000
@@ -23,36 +23,36 @@
 ### Maven Central
 You can search on The Central Repository with GroupId and ArtifactId [![Maven Search](https://img.shields.io/badge/org.postgresql-postgresql-yellow.svg)][mvn-search] for:
 
-[![Java 8](https://img.shields.io/badge/Java_8-42.2.3-blue.svg)][mvn-jre8]
+[![Java 8](https://img.shields.io/badge/Java_8-42.2.4-blue.svg)][mvn-jre8]
 ```xml
 <dependency>
     <groupId>org.postgresql</groupId>
     <artifactId>postgresql</artifactId>
-    <version>42.2.3</version>
+    <version>42.2.4</version>
 </dependency>
 ```
 
-[![Java 7](https://img.shields.io/badge/Java_7-42.2.3.jre7-blue.svg)][mvn-jre7]
+[![Java 7](https://img.shields.io/badge/Java_7-42.2.4.jre7-blue.svg)][mvn-jre7]
 ```xml
 <dependency>
     <groupId>org.postgresql</groupId>
     <artifactId>postgresql</artifactId>
-    <version>42.2.3.jre7</version>
+    <version>42.2.4.jre7</version>
 </dependency>
 ```
 
-[![Java 6](https://img.shields.io/badge/Java_6-42.2.3.jre6-blue.svg)][mvn-jre6]
+[![Java 6](https://img.shields.io/badge/Java_6-42.2.4.jre6-blue.svg)][mvn-jre6]
 ```xml
 <dependency>
     <groupId>org.postgresql</groupId>
     <artifactId>postgresql</artifactId>
-    <version>42.2.3.jre6</version>
+    <version>42.2.4.jre6</version>
 </dependency>
 ```
 [mvn-search]: http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.postgresql%22%20AND%20a%3A%22postgresql%22 "Search on Maven Central"
-[mvn-jre6]: http://search.maven.org/#artifactdetails|org.postgresql|postgresql|42.2.3.jre6|bundle
-[mvn-jre7]: http://search.maven.org/#artifactdetails|org.postgresql|postgresql|42.2.3.jre7|bundle
-[mvn-jre8]: http://search.maven.org/#artifactdetails|org.postgresql|postgresql|42.2.3|bundle
+[mvn-jre6]: http://search.maven.org/#artifactdetails|org.postgresql|postgresql|42.2.4.jre6|bundle
+[mvn-jre7]: http://search.maven.org/#artifactdetails|org.postgresql|postgresql|42.2.4.jre7|bundle
+[mvn-jre8]: http://search.maven.org/#artifactdetails|org.postgresql|postgresql|42.2.4|bundle
 
 #### Development snapshots
 Snapshot builds (builds from `master` branch) are also deployed to Maven Central, so you can test current development version (test some bugfix) using:
@@ -60,9 +60,9 @@
 <dependency>
   <groupId>org.postgresql</groupId>
   <artifactId>postgresql</artifactId>
-  <version>42.2.4-SNAPSHOT</version> <!-- Java 8 -->
-  <version>42.2.4.jre7-SNAPSHOT</version> <!-- Java 7 -->
-  <version>42.2.4.jre6-SNAPSHOT</version> <!-- Java 6 -->
+  <version>42.2.5-SNAPSHOT</version> <!-- Java 8 -->
+  <version>42.2.5.jre7-SNAPSHOT</version> <!-- Java 7 -->
+  <version>42.2.5.jre6-SNAPSHOT</version> <!-- Java 6 -->
 </dependency>
 ```
 
@@ -111,7 +111,7 @@
 | password                      | String  | null    | The database user's password. |
 | ssl                           | Boolean | false   | Control use of SSL (true value causes SSL to be required) |
 | sslfactory                    | String  | null    | Provide a SSLSocketFactory class when using SSL. |
-| sslfactoryarg                 | String  | null    | Argument forwarded to constructor of SSLSocketFactory class. |
+| sslfactoryarg (deprecated)    | String  | null    | Argument forwarded to constructor of SSLSocketFactory class. |
 | sslmode                       | String  | null    | Parameter governing the use of SSL. |
 | sslcert                       | String  | null    | The location of the client's SSL certificate |
 | sslkey                        | String  | null    | The location of the client's PKCS#8 SSL key |
@@ -144,7 +144,7 @@
 | hostRecheckSeconds            | Integer | 10      | Specifies period (seconds) after which the host status is checked again in case it has changed |
 | loadBalanceHosts              | Boolean | false   | If disabled hosts are connected in the given order. If enabled hosts are chosen randomly from the set of suitable candidates |
 | socketFactory                 | String  | null    | Specify a socket factory for socket creation |
-| socketFactoryArg              | String  | null    | Argument forwarded to constructor of SocketFactory class. |
+| socketFactoryArg (deprecated) | String  | null    | Argument forwarded to constructor of SocketFactory class. |
 | autosave                      | String  | never   | Specifies what the driver should do if a query fails, possible values: always, never, conservative |
 | preferQueryMode               | String  | extended | Specifies which mode is used to execute queries to database, possible values: extended, extendedForPrepared, extendedCacheEverything, simple |
 | reWriteBatchedInserts         | Boolean | false  | Enable optimization to rewrite and collapse compatible INSERT statements that are batched. |
diff -Nru libpgjava-42.2.4/ssltest.properties libpgjava-42.2.5/ssltest.properties
--- libpgjava-42.2.4/ssltest.properties	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/ssltest.properties	2018-08-27 15:38:30.000000000 +0000
@@ -1,32 +1,2 @@
-
-  
 certdir=certdir
-
-# Uncomment to enable testing of SingleCertValidatingFactory
-#testsinglecertfactory=true
-
-ssloff9=
-ssloff9prefix=
-
-#sslhostnossl9=jdbc:postgresql://localhost:5432/hostnossldb?sslpassword=sslpwd
-sslhostnossl9prefix=
-
-#sslhostgh9=jdbc:postgresql://localhost:5432/hostdb?sslpassword=sslpwd
-sslhostgh9prefix=
-#sslhostbh9=jdbc:postgresql://127.0.0.1:5432/hostdb?sslpassword=sslpwd
-sslhostbh9prefix=
-
-#sslhostsslgh9=jdbc:postgresql://localhost:5432/hostssldb?sslpassword=sslpwd
-sslhostsslgh9prefix=
-#sslhostsslbh9=jdbc:postgresql://127.0.0.1:5432/hostssldb?sslpassword=sslpwd
-sslhostsslbh9prefix=
-
-#sslhostsslcertgh9=jdbc:postgresql://localhost:5432/hostsslcertdb?sslpassword=sslpwd
-sslhostsslcertgh9prefix=
-#sslhostsslcertbh9=jdbc:postgresql://127.0.0.1:5432/hostsslcertdb?sslpassword=sslpwd
-sslhostsslcertbh9prefix=
-
-#sslcertgh9=jdbc:postgresql://localhost:5432/certdb?sslpassword=sslpwd
-sslcertgh9prefix=
-#sslcertbh9=jdbc:postgresql://127.0.0.1:5432/certdb?sslpassword=sslpwd
-sslcertbh9prefix=
\ No newline at end of file
+#enable_ssl_tests=true
diff -Nru libpgjava-42.2.4/.travis/travis_configure_ssl.sh libpgjava-42.2.5/.travis/travis_configure_ssl.sh
--- libpgjava-42.2.4/.travis/travis_configure_ssl.sh	2018-07-14 13:42:24.000000000 +0000
+++ libpgjava-42.2.5/.travis/travis_configure_ssl.sh	2018-08-27 15:38:30.000000000 +0000
@@ -22,16 +22,7 @@
 set_conf_property "ssl_key_file" "server.key"
 set_conf_property "ssl_ca_file" "root.crt"
 
-enable_ssl_property "testsinglecertfactory"
-enable_ssl_property "sslhostnossl9"
-enable_ssl_property "sslhostgh9"
-enable_ssl_property "sslhostbh9"
-enable_ssl_property "sslhostsslgh9"
-enable_ssl_property "sslhostsslbh9"
-enable_ssl_property "sslhostsslcertgh9"
-enable_ssl_property "sslhostsslcertbh9"
-enable_ssl_property "sslcertgh9"
-enable_ssl_property "sslcertbh9"
+enable_ssl_property "enable_ssl_tests"
 
 PG_DATA_DIR="/etc/postgresql/${PG_VERSION}/main/"
 sudo cp certdir/server/pg_hba.conf "/etc/postgresql/${PG_VERSION}/main/pg_hba.conf"