Merge branch 'production'

* production: Update POT files using the production database Update translations from Transifex MBS-12437: Limit overflow-wrap even more (#2561) MBS-12400: fix non-musicbrainz-schema dumps (#2541) Sync incremental JSON dumps to trille
metabrainz · Jun 7, 2022 · 9add1d3 · 9add1d3
2 parents d63f32f + 923237c
commit 9add1d3
Show file tree

Hide file tree

Showing 33 changed files with 370 additions and 282 deletions.
diff --git a/admin/ExportAllTables b/admin/ExportAllTables
@@ -228,7 +228,15 @@ if ($fDoReplication)
         if ($dump_dbmirror2) {
             # NULL columns that are useless on slaves.
             $sql->do('UPDATE dbmirror2.pending_data SET oldctid = NULL, trgdepth = NULL');
-            $mbdump->dump_table($_) for @dbmirror2_tables;
+
+            for my $table (@dbmirror2_tables) {
+                # Map the schema-qualified dbmirror2 table names to file
+                # names without the schema inside the packet.
+                my $table_noschema = $table =~ s/^dbmirror2\.//r;
+                $mbdump->table_file_mapping->{$table} = $table_noschema;
+                $mbdump->dump_table($table);
+            }
+
             $mbdump->write_file('DBMIRROR_VERSION', "2\n");
         }
 

diff --git a/admin/config.incremental-json-dump.sh b/admin/config.incremental-json-dump.sh
@@ -1,4 +1,4 @@
-RSYNC_FULLEXPORT_HOST='10.2.2.40'
+RSYNC_FULLEXPORT_HOST='10.2.2.39'
 RSYNC_FULLEXPORT_DIR="$JSON_DUMP_DIR/incremental"
 RSYNC_FULLEXPORT_KEY='~/.ssh/rsync-json-dumps-incremental'
 RSYNC_LATEST_KEY=''
diff --git a/lib/MusicBrainz/Script/DatabaseDump.pm b/lib/MusicBrainz/Script/DatabaseDump.pm
@@ -137,11 +137,6 @@ sub _open_table_file {
 sub dump_table {
     my ($self, $table) = @_;
 
-    my $table_noschema = $table =~ s/^[^.]+\.//r;
-    if ($table ne $table_noschema) {
-        $self->table_file_mapping->{$table} = $table_noschema;
-    }
-
     my ($dump_fh, $table_file_path) = $self->_open_table_file($table, '>');
 
     my $rows_estimate = $self->row_counts->{$table} //

diff --git a/po/attributes.it.po b/po/attributes.it.po
@@ -6,15 +6,15 @@
 # Gioele  <email address hidden>, 2012
 # Gioele <email address hidden>, 2012
 # leofiore <email address hidden>, 2012
-# salo.rock, 2016-2022
-# salo.rock, 2013-2015
-# salo.rock, 2012
-# salo.rock, 2022
+# Luca Salini, 2016-2022
+# Luca Salini, 2013-2015
+# Luca Salini, 2012
+# Luca Salini, 2022
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 18:52+0000\n"
-"Last-Translator: salo.rock, 2022\n"
+"Last-Translator: Luca Salini, 2022\n"
 "Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/attributes.nl.po b/po/attributes.nl.po
@@ -2,8 +2,8 @@
 # Translators:
 # reneweesp <email address hidden>, 2017
 # Maurits Meulenbelt <email address hidden>, 2012
-# Maurits Meulenbelt <email address hidden>, 2012
-# Maurits Meulenbelt <email address hidden>, 2013-2022
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2013-2022
 # Nikolai Prokoschenko <email address hidden>, 2011
 # Nikolai Prokoschenko <email address hidden>, 2011
 # Niko Strijbol <email address hidden>, 2018
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 18:52+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2013-2022\n"
+"Last-Translator: Maurits Meulenbelt, 2013-2022\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/attributes.pot b/po/attributes.pot
@@ -289,6 +289,13 @@ msgid ""
 "intended to improve the audience members' playing skills."
 msgstr ""
 
+#: DB:release_packaging/description:56
+msgctxt "release_packaging"
+msgid ""
+"A minimalistic plastic case where the back and front are kept together by a "
+"small hinge. Most commonly used for cheap promotion / DIY releases."
+msgstr ""
+
 #: DB:work_attribute_type_allowed_value/value:29
 msgctxt "work_attribute_type_allowed_value"
 msgid "A minor"
@@ -1858,6 +1865,11 @@ msgctxt "area_type"
 msgid "City is used for settlements of any size, including towns and villages."
 msgstr ""
 
+#: DB:release_packaging/name:56
+msgctxt "release_packaging"
+msgid "Clamshell Case"
+msgstr ""
+
 #: DB:release_group_secondary_type/name:1
 msgctxt "release_group_secondary_type"
 msgid "Compilation"

diff --git a/po/countries.it.po b/po/countries.it.po
@@ -2,13 +2,13 @@
 # Translators:
 # Gioele <email address hidden>, 2012
 # leofiore <email address hidden>, 2012
-# salo.rock, 2014-2015
-# salo.rock, 2012
+# Luca Salini, 2014-2015
+# Luca Salini, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 19:20+0000\n"
-"Last-Translator: salo.rock, 2014-2015\n"
+"Last-Translator: Luca Salini, 2014-2015\n"
 "Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/countries.nl.po b/po/countries.nl.po
@@ -1,13 +1,13 @@
 # 
 # Translators:
-# Maurits Meulenbelt <email address hidden>, 2012
-# Maurits Meulenbelt <email address hidden>, 2014-2015
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2014-2015
 # Nikolai Prokoschenko <email address hidden>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 19:20+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2014-2015\n"
+"Last-Translator: Maurits Meulenbelt, 2014-2015\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/instrument_descriptions.it.po b/po/instrument_descriptions.it.po
@@ -7,16 +7,16 @@
 # Fen0x F <email address hidden>, 2020
 # Gioele <email address hidden>, 2012
 # leofiore <email address hidden>, 2012
-# salo.rock, 2020-2022
-# salo.rock, 2020
-# salo.rock, 2012
-# salo.rock, 2022
+# Luca Salini, 2020-2022
+# Luca Salini, 2020
+# Luca Salini, 2012
+# Luca Salini, 2022
 # Valentina Menale <email address hidden>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 19:17+0000\n"
-"Last-Translator: salo.rock, 2020-2022\n"
+"Last-Translator: Luca Salini, 2020-2022\n"
 "Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/instrument_descriptions.nl.po b/po/instrument_descriptions.nl.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
 # reneweesp <email address hidden>, 2017-2019
-# Maurits Meulenbelt <email address hidden>, 2012
-# Maurits Meulenbelt <email address hidden>, 2012-2022
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2012-2022
 # Nikolai Prokoschenko <email address hidden>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 19:17+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012-2022\n"
+"Last-Translator: Maurits Meulenbelt, 2012-2022\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/instrument_descriptions.pot b/po/instrument_descriptions.pot
@@ -2473,6 +2473,13 @@ msgid ""
 "ornate case."
 msgstr ""
 
+#. name:bass saxophone 
+#: DB:instrument/description:444
+msgid ""
+"Second largest and lowest member of the saxophone family. It is similar to "
+"the baritone, but larger and with a longer loop near the mouthpiece."
+msgstr ""
+
 #. name:jublag 
 #: DB:instrument/description:980
 msgid ""
@@ -2917,13 +2924,6 @@ msgid ""
 "The alto flute is a concert flute in G, lower in tone than the flûte d'amour."
 msgstr ""
 
-#. name:alto saxophone 
-#: DB:instrument/description:21
-msgid ""
-"The alto saxophone is a woodwind invented by Adolphe Sax which is between "
-"the tenor and soprano in size."
-msgstr ""
-
 #. name:archlute 
 #: DB:instrument/description:507
 msgid ""
@@ -2996,12 +2996,6 @@ msgid ""
 "mouthpiece which is pitched in B♭, one octave below the B♭ trumpet."
 msgstr ""
 
-#. name:baritone saxophone 
-#: DB:instrument/description:23
-msgid ""
-"The baritone saxophone is the largest and lowest-pitch saxophone in wide use."
-msgstr ""
-
 #. name:bass clarinet 
 #: DB:instrument/description:11
 msgid ""
@@ -3030,14 +3024,6 @@ msgid ""
 "size of a regular oboe."
 msgstr ""
 
-#. name:bass saxophone 
-#: DB:instrument/description:444
-msgid ""
-"The bass saxophone is the second largest existing member of the saxophone "
-"family (not counting the subcontrabass tubax). It is similar in design to a "
-"baritone saxophone, but it is larger, with a longer loop near the mouthpiece."
-msgstr ""
-
 #. name:bass trumpet 
 #: DB:instrument/description:727
 msgid ""
@@ -3604,6 +3590,14 @@ msgid ""
 "\"female\" drum."
 msgstr ""
 
+#. name:contrabass saxophone 
+#: DB:instrument/description:446
+msgid ""
+"The largest and lowest pitch member of the saxophone family (ignoring the "
+"subcontrabass <a href=\"/"
+"instrument/6e33958d-741f-4669-955a-5a29a99f72e1\">tubax</a>)"
+msgstr ""
+
 #. name:lasso d'amore 
 #: DB:instrument/description:144
 msgid ""
@@ -3668,6 +3662,18 @@ msgid ""
 "shorter than the others, creating an uneven pitch progression."
 msgstr ""
 
+#. name:alto saxophone 
+#: DB:instrument/description:21
+msgid "The most common member of the saxophone family, it is the alto member."
+msgstr ""
+
+#. name:baritone saxophone 
+#: DB:instrument/description:23
+msgid ""
+"The most common of the lower members of the saxophone family, it is the "
+"middle-low baritone."
+msgstr ""
+
 #. name:violin 
 #: DB:instrument/description:62
 msgid ""

diff --git a/po/instruments.it.po b/po/instruments.it.po
@@ -7,15 +7,15 @@
 # Gioele <email address hidden>, 2012
 # leofiore <email address hidden>, 2012
 # Luca Panfilo <email address hidden>, 2017
-# salo.rock, 2020-2022
+# Luca Salini, 2020-2022
 # Monica <email address hidden>, 2014
-# salo.rock, 2012
+# Luca Salini, 2012
 # Valentina Menale <email address hidden>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 18:57+0000\n"
-"Last-Translator: salo.rock, 2020-2022\n"
+"Last-Translator: Luca Salini, 2020-2022\n"
 "Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/instruments.nl.po b/po/instruments.nl.po
@@ -2,16 +2,16 @@
 # Translators:
 # nikki, 2014
 # reneweesp <email address hidden>, 2017,2019
-# Maurits Meulenbelt <email address hidden>, 2012
-# Maurits Meulenbelt <email address hidden>, 2012-2022
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2012-2022
 # nikki, 2014
 # Nikolai Prokoschenko <email address hidden>, 2011
 # reneweesp <email address hidden>, 2017,2019
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 18:57+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012-2022\n"
+"Last-Translator: Maurits Meulenbelt, 2012-2022\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/instruments.pot b/po/instruments.pot
@@ -326,6 +326,7 @@ msgid "alto flute"
 msgstr ""
 
 #: DB:instrument/name:21
+msgctxt "Middle member of the saxophone family"
 msgid "alto saxophone"
 msgstr ""
 
@@ -495,6 +496,7 @@ msgid "baritone horn"
 msgstr ""
 
 #: DB:instrument/name:23
+msgctxt "Middle-Low member of the saxophone family"
 msgid "baritone saxophone"
 msgstr ""
 
@@ -563,6 +565,7 @@ msgid "bass recorder"
 msgstr ""
 
 #: DB:instrument/name:444
+msgctxt "Second lowest member of the saxophone family"
 msgid "bass saxophone"
 msgstr ""
 
@@ -1102,6 +1105,7 @@ msgid "contrabass recorder"
 msgstr ""
 
 #: DB:instrument/name:446
+msgctxt "Largest member of the saxophone family"
 msgid "contrabass saxophone"
 msgstr ""
 

diff --git a/po/languages.it.po b/po/languages.it.po
@@ -2,14 +2,14 @@
 # Translators:
 # Gioele <email address hidden>, 2012
 # leofiore <email address hidden>, 2012
-# salo.rock, 2016-2022
-# salo.rock, 2013-2015
-# salo.rock, 2012
+# Luca Salini, 2016-2022
+# Luca Salini, 2013-2015
+# Luca Salini, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 19:23+0000\n"
-"Last-Translator: salo.rock, 2016-2022\n"
+"Last-Translator: Luca Salini, 2016-2022\n"
 "Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/languages.nl.po b/po/languages.nl.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
-# Maurits Meulenbelt <email address hidden>, 2012
-# Maurits Meulenbelt <email address hidden>, 2013-2022
+# Maurits Meulenbelt, 2012
+# Maurits Meulenbelt, 2013-2022
 # Nathan Follens, 2017
 # Nikolai Prokoschenko <email address hidden>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "PO-Revision-Date: 2012-05-24 19:23+0000\n"
-"Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2013-2022\n"
+"Last-Translator: Maurits Meulenbelt, 2013-2022\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"