--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: postgresql-com...@packages.debian.org
Control: affects -1 + src:postgresql-common
Please unblock package postgresql-common.
The new version contains an updated translation and fixes a small
config file parsing issue.
[ Tests ]
The postgresql-common testsuite passes.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
(well, git diff)
unblock postgresql-common/248
Christoph
diff --git a/PgCommon.pm b/PgCommon.pm
index 783aa4c..e51d89e 100644
--- a/PgCommon.pm
+++ b/PgCommon.pm
@@ -340,8 +340,8 @@ sub set_conffile_value {
# of appending
if (!$found) {
for (my $i=0; $i <= $#lines; ++$i) {
- if ($lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)\w+\b((?:\s*#.*)?)/i or
- $lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)'[^']*'((?:\s*#.*)?)/i) {
+ if ($lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)\w+\b((?:\s*#.*)?)$/i or
+ $lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)'[^']*'((?:\s*#.*)?)$/i) {
$lines[$i] = "$1$2$value$3\n";
$found = 1;
last;
diff --git a/debian/changelog b/debian/changelog
index dbdbe2c..4a2306b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+postgresql-common (248) unstable; urgency=medium
+
+ [ Christoph Berg ]
+ * Update ro debconf translation, mulțumesc Remus-Gabriel Chelu!
+
+ [ Athos Ribeiro ]
+ * Fix set_conffile_value comment parsing regular expression.
+
+ -- Christoph Berg <m...@debian.org> Tue, 14 Mar 2023 15:19:01 +0100
+
postgresql-common (247) unstable; urgency=medium
[ Christoph Berg ]
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 5faa387..86d4d41 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -1,23 +1,30 @@
-# translation of templates.po to Romanian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Mesajele în limba română pentru pachetul postgresql-common.
+# translation of postgresql-common.po to Romanian
+# Copyright © 2008, 2023 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the postgresql-common package.
#
# Igor Stirbu <igor.sti...@gmail.com>, 2008.
+# Remus-Gabriel Chelu <remusgabriel.ch...@disroot.org>, 2023.
+# NOTĂ: la sugestia lui Daniel Șerbănescu, am vrut să traduc cluster(s) = grup(uri) de servere;
+# dar în textul mesajelor, nu rezultă foarte clar dacă cluster(s) = ca mai sus(grup de servere),
+# sau este vorba de baza/bazele de date ale acestora, sau decît directorul(ele) ce găzduiesc
+# aceste baze de date. Așa că le-am lăsat în românizatul cluster(e)/clusterul(ele). Scuze...
+#
msgid ""
msgstr ""
-"Project-Id-Version: templates\n"
+"Project-Id-Version: postgresql-common 246\n"
"Report-Msgid-Bugs-To: postgresql-com...@packages.debian.org\n"
"POT-Creation-Date: 2016-03-05 11:47+0100\n"
-"PO-Revision-Date: 2008-07-21 10:32+0300\n"
-"Last-Translator: Igor Stirbu <igor.sti...@gmail.com>\n"
+"PO-Revision-Date: 2023-02-12 18:02+0100\n"
+"Last-Translator: Remus-Gabriel Chelu <remusgabriel.ch...@disroot.org>\n"
"Language-Team: Romanian <debian-l10n-roman...@lists.debian.org>\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2;\n"
+"X-Generator: Poedit 3.2.2\n"
#. Type: error
#. Description
@@ -31,38 +38,38 @@ msgstr "Versiunea majoră învechită ${old}"
#: ../postgresql-common.templates:1001
msgid ""
"The PostgreSQL version ${old} is obsolete, but the server or client packages "
-"are still installed. Please install the latest packages (postgresql-"
-"${latest} and postgresql-client-${latest}) and upgrade the existing "
-"${oldversion} clusters with pg_upgradecluster (see manpage)."
+"are still installed. Please install the latest packages (postgresql-${latest} "
+"and postgresql-client-${latest}) and upgrade the existing ${oldversion} "
+"clusters with pg_upgradecluster (see manpage)."
msgstr ""
"Versiunea PostgreSQL ${old} este învechită, dar pachetele pentru server sau "
"client sunt încă instalate. Instalați cele mai recente pachete (postgresql-"
"${latest} și postgresql-client-${latest}) și actualizați clusterele "
-"${oldversion} existente cu pg_upgradecluster (a se vedea pagina de manual)."
+"${oldversion} existente cu ajutorul comenzii «pg_upgradecluster» (consultați "
+"pagina de manual)."
#. Type: error
#. Description
#: ../postgresql-common.templates:1001
msgid ""
"Please be aware that the installation of postgresql-${latest} will "
-"automatically create a default cluster ${latest}/main. If you want to "
-"upgrade the ${old}/main cluster, you need to remove the already existing "
-"${latest} cluster (pg_dropcluster --stop ${latest} main, see manpage for "
-"details)."
+"automatically create a default cluster ${latest}/main. If you want to upgrade "
+"the ${old}/main cluster, you need to remove the already existing ${latest} "
+"cluster (pg_dropcluster --stop ${latest} main, see manpage for details)."
msgstr ""
-"Se atrage atenția că instalarea postgresql-${latest} va crea în mod automat "
-"un cluster implicit ${latest}/main. Dacă doriți să actualizați clusterul "
-"${old}/main, este necesar să eliminați clusterul ${latest} care deja există "
-"(pg_dropcluster --stop ${latest} main, a se vedea pagina de manual pentru "
+"Se atrage atenția că instalarea postgresql-${latest} va crea în mod automat un "
+"cluster implicit „${latest}/main”. Dacă doriți să actualizați clusterul „${old}/"
+"main”, este necesar să eliminați clusterul „${latest}” care deja există "
+"(«pg_dropcluster --stop ${latest} main», consultați pagina de manual pentru "
"detalii)."
#. Type: error
#. Description
#: ../postgresql-common.templates:1001
msgid ""
-"The old server and client packages are no longer supported. After the "
-"existing clusters are upgraded, the postgresql-${old} and postgresql-client-"
-"${old} packages should be removed."
+"The old server and client packages are no longer supported. After the existing "
+"clusters are upgraded, the postgresql-${old} and postgresql-client-${old} "
+"packages should be removed."
msgstr ""
"Pachetele vechi pentru server și client nu mai sunt întreținute. După "
"actualizarea clusterelor existente pachetele postgresql-${old} și postgresql-"
@@ -71,58 +78,69 @@ msgstr ""
#. Type: error
#. Description
#: ../postgresql-common.templates:1001
-msgid ""
-"Please see /usr/share/doc/postgresql-common/README.Debian.gz for details."
+msgid "Please see /usr/share/doc/postgresql-common/README.Debian.gz for details."
msgstr ""
-"A se vedea /usr/share/doc/postgresql-common/README.Debian.gz pentru detalii."
+"Consultați „/usr/share/doc/postgresql-common/README.Debian.gz” pentru detalii."
#. Type: boolean
#. Description
#: ../postgresql-common.templates:2001
msgid "Enable SSL by default in new PostgreSQL clusters?"
-msgstr ""
+msgstr "Activați protocolul SSL în mod implicit în noile clustere PostgreSQL?"
#. Type: boolean
#. Description
#: ../postgresql-common.templates:2001
msgid ""
"PostgreSQL supports SSL-encrypted connections. This is usually a good thing. "
-"However, if the database is solely accessed using TCP connections on "
-"localhost, SSL can be turned off without introducing security issues."
+"However, if the database is solely accessed using TCP connections on localhost, "
+"SSL can be turned off without introducing security issues."
msgstr ""
+"PostgreSQL acceptă conexiuni criptate SSL. Acesta este de obicei un lucru bun. "
+"Cu toate acestea, dacă baza de date este accesată exclusiv folosind conexiuni "
+"TCP în localhost (mașina ta), protocolul SSL poate fi dezactivat fără a "
+"introduce probleme de securitate."
#. Type: boolean
#. Description
#: ../postgresql-common.templates:2001
msgid ""
"UNIX domain socket connections (called \"local\" in pg_hba.conf) are not "
-"affected by this setting. This setting concerns new PostgreSQL clusters "
-"created during package install, or by using the pg_createcluster command. It "
-"does not reconfigure existing clusters."
+"affected by this setting. This setting concerns new PostgreSQL clusters created "
+"during package install, or by using the pg_createcluster command. It does not "
+"reconfigure existing clusters."
msgstr ""
+"Conexiunile la soclul de domeniu UNIX (numite „local” în „pg_hba.conf”) nu sunt "
+"afectate de această configurare. Această configurare se referă la noile "
+"clustere PostgreSQL create în timpul instalării pachetului, sau prin utilizarea "
+"comenzii «pg_createcluster». Nu reconfigurează clusterele existente."
#. Type: boolean
#. Description
#: ../postgresql-common.templates:2001
msgid "If unsure, enable SSL."
-msgstr ""
+msgstr "Dacă nu sunteți sigur, activați protocolul SSL."
#. Type: note
#. Description
#: ../postgresql-common.templates:3001
msgid "PostgreSQL ${version} catalog version changed"
-msgstr ""
+msgstr "Versiunea catalogului PostgreSQL ${version} a fost schimbată"
#. Type: note
#. Description
#: ../postgresql-common.templates:3001
msgid ""
-"The PostgreSQL cluster ${version} ${cluster} was created using catalog "
-"version ${db_catversion}, but the currently being installed package "
-"postgresql-${version} is using catalog version ${new_catversion}. You will "
-"not be able to use this cluster until it was upgraded to the new catalog "
-"version."
+"The PostgreSQL cluster ${version} ${cluster} was created using catalog version "
+"${db_catversion}, but the currently being installed package postgresql-"
+"${version} is using catalog version ${new_catversion}. You will not be able to "
+"use this cluster until it was upgraded to the new catalog version."
msgstr ""
+"Clusterul PostgreSQL ${cluster} ${version} a fost creat folosind versiunea de "
+"catalog ${db_catversion}, dar pachetul în curs de instalare postgresql-"
+"${version} folosește versiunea de catalog ${new_catversion}. Nu veți putea să "
+"utilizați acest cluster până când nu a fost actualizat la noua versiune de "
+"catalog."
#. Type: note
#. Description
@@ -131,3 +149,5 @@ msgid ""
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
+"Subsetul necesar de binare din versiunea veche a fost salvat în „${vartmpdir}”. "
+"Pentru a actualiza clusterul, executați aceste comenzi:"
diff --git a/t/005_PgCommon.t b/t/005_PgCommon.t
index 22dcca8..e1bc337 100644
--- a/t/005_PgCommon.t
+++ b/t/005_PgCommon.t
@@ -102,6 +102,9 @@ print F <<EOF;
# Commented_Int = 12
# commented_str='foobar'
+# commented_bool off
+# commented_bool2 off # comment
+# commented_bool3 just a comment
#intval = 1
Intval = 42
@@ -194,6 +197,9 @@ is_deeply (\%conf, {
# test set_conf_value()
PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_int', '24';
PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_str', 'new foo';
+PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_bool', 'on';
+PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_bool2', 'on';
+PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_bool3', 'on';
PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'intval', '39';
PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'cintval', '5';
PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'strval', 'Howdy';
@@ -210,6 +216,9 @@ is ($conf, <<EOF, 'set_conf_value');
Commented_Int = 24
commented_str='new foo'
+commented_bool on
+commented_bool2 on # comment
+# commented_bool3 just a comment
#intval = 1
Intval = 39
@@ -223,6 +232,7 @@ cemptystr = '' # moo!
#testpath = '/bin/bad'
testpath = '/bin/new'
QuoteStr = 'test ! -f \\'/tmp/%f\\' && echo \\'yes\\''
+commented_bool3 = on
newval = 'NEW!'
include_dir = 'conf.d'
EOF
@@ -241,6 +251,9 @@ is ($conf, <<EOF, 'disable_conf_value');
Commented_Int = 24
commented_str='new foo'
+commented_bool on
+commented_bool2 on # comment
+# commented_bool3 just a comment
#intval = 1
#Intval = 39 #ints are out of fashion
@@ -254,6 +267,7 @@ cemptystr = '' # moo!
#testpath = '/bin/bad'
#testpath = '/bin/new' #now 2 comments
QuoteStr = 'test ! -f \\'/tmp/%f\\' && echo \\'yes\\''
+commented_bool3 = on
newval = 'NEW!'
include_dir = 'conf.d'
EOF
@@ -272,6 +286,9 @@ is ($conf, <<EOF, 'replace_conf_value');
Commented_Int = 24
commented_str='new foo'
+commented_bool on
+commented_bool2 on # comment
+# commented_bool3 just a comment
#intval = 1
#Intval = 39 #ints are out of fashion
@@ -286,6 +303,7 @@ cemptystr = '' # moo!
#testpath = '/bin/bad'
#testpath = '/bin/new' #now 2 comments
QuoteStr = 'test ! -f \\'/tmp/%f\\' && echo \\'yes\\''
+commented_bool3 = on
newval = 'NEW!'
include_dir = 'conf.d'
EOF
--- End Message ---
