Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package barrel for openSUSE:Factory checked
in at 2022-06-10 15:57:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/barrel (Old)
and /work/SRC/openSUSE:Factory/.barrel.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "barrel"
Fri Jun 10 15:57:45 2022 rev:10 rq:982004 version:0.1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/barrel/barrel.changes 2022-05-28
22:15:09.656820350 +0200
+++ /work/SRC/openSUSE:Factory/.barrel.new.1548/barrel.changes 2022-06-10
15:58:06.220861994 +0200
@@ -1,0 +2,6 @@
+Thu Jun 09 15:17:42 CEST 2022 - aschn...@suse.com
+
+- show btrfs profiles
+- version 0.1.5
+
+-------------------------------------------------------------------
Old:
----
barrel-0.1.4.tar.xz
New:
----
barrel-0.1.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ barrel.spec ++++++
--- /var/tmp/diff_new_pack.qByIA5/_old 2022-06-10 15:58:06.748862634 +0200
+++ /var/tmp/diff_new_pack.qByIA5/_new 2022-06-10 15:58:06.752862640 +0200
@@ -17,7 +17,7 @@
Name: barrel
-Version: 0.1.4
+Version: 0.1.5
Release: 0
Summary: Tool for storage management
License: GPL-2.0-only
++++++ barrel-0.1.4.tar.xz -> barrel-0.1.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/VERSION new/barrel-0.1.5/VERSION
--- old/barrel-0.1.4/VERSION 2022-05-27 08:47:25.000000000 +0200
+++ new/barrel-0.1.5/VERSION 2022-06-09 16:40:56.000000000 +0200
@@ -1 +1 @@
-0.1.4
+0.1.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/barrel/Utils/Table.cc
new/barrel-0.1.5/barrel/Utils/Table.cc
--- old/barrel-0.1.4/barrel/Utils/Table.cc 2022-01-11 10:37:02.000000000
+0100
+++ new/barrel-0.1.5/barrel/Utils/Table.cc 2022-06-09 16:40:56.000000000
+0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 SUSE LLC
+ * Copyright (c) [2021-2022] SUSE LLC
*
* All Rights Reserved.
*
@@ -30,8 +30,51 @@
using namespace std;
+ Table::OutputInfo::OutputInfo(const Table& table)
+ {
+ // calculate hidden, default to false
+
+ hidden.resize(table.header.get_columns().size());
+
+ for (size_t i = 0; i < table.visibilities.size(); ++i)
+ {
+ if (table.visibilities[i] == Visibility::AUTO ||
table.visibilities[i] == Visibility::OFF)
+ hidden[i] = true;
+ }
+
+ for (const Table::Row& row : table.rows)
+ calculate_hidden(table, row);
+
+ // calculate widths
+
+ widths = table.min_widths;
+
+ if (table.style != Style::NONE)
+ calculate_widths(table, table.header, 0);
+
+ for (const Table::Row& row : table.rows)
+ calculate_widths(table, row, 0);
+ }
+
+
void
- Table::calculate_widths(const Table::Row& row, vector<size_t>& widths,
unsigned indent) const
+ Table::OutputInfo::calculate_hidden(const Table& table, const Table::Row&
row)
+ {
+ const vector<string>& columns = row.get_columns();
+
+ for (size_t i = 0; i < min(columns.size(), table.visibilities.size());
++i)
+ {
+ if (table.visibilities[i] == Visibility::AUTO &&
!columns[i].empty())
+ hidden[i] = false;
+ }
+
+ for (const Table::Row& subrow : row.get_subrows())
+ calculate_hidden(table, subrow);
+ }
+
+
+ void
+ Table::OutputInfo::calculate_widths(const Table& table, const Table::Row&
row, unsigned indent)
{
const vector<string>& columns = row.get_columns();
@@ -40,33 +83,38 @@
for (size_t i = 0; i < columns.size(); ++i)
{
+ if (hidden[i])
+ continue;
+
size_t width = mbs_width(columns[i]);
- if (i == tree_index)
+ if (i == table.tree_index)
width += 2 * indent;
widths[i] = max(widths[i], width);
}
for (const Table::Row& subrow : row.get_subrows())
- calculate_widths(subrow, widths, indent + 1);
+ calculate_widths(table, subrow, indent + 1);
}
void
- Table::output(std::ostream& s, const Table::Row& row, const
vector<size_t>& widths,
- const vector<bool>& lasts) const
+ Table::output(std::ostream& s, const Table::Row& row, const OutputInfo&
output_info, const vector<bool>& lasts) const
{
s << string(global_indent, ' ');
const vector<string>& columns = row.get_columns();
- for (size_t i = 0; i < widths.size(); ++i)
+ for (size_t i = 0; i < output_info.widths.size(); ++i)
{
+ if (output_info.hidden[i])
+ continue;
+
string column = i < columns.size() ? columns[i] : "";
bool first = i == 0;
- bool last = i == widths.size() - 1;
+ bool last = i == output_info.widths.size() - 1;
size_t extra = (i == tree_index) ? 2 * lasts.size() : 0;
@@ -91,8 +139,8 @@
{
size_t width = mbs_width(column);
- if (width < widths[i] - extra)
- s << string(widths[i] - width - extra, ' ');
+ if (width < output_info.widths[i] - extra)
+ s << string(output_info.widths[i] - width - extra, ' ');
}
s << column;
@@ -104,8 +152,8 @@
{
size_t width = mbs_width(column);
- if (width < widths[i] - extra)
- s << string(widths[i] - width - extra, ' ');
+ if (width < output_info.widths[i] - extra)
+ s << string(output_info.widths[i] - width - extra, ' ');
}
s << " " << glyph(0);
@@ -118,22 +166,25 @@
{
vector<bool> sub_lasts = lasts;
sub_lasts.push_back(i == subrows.size() - 1);
- output(s, subrows[i], widths, sub_lasts);
+ output(s, subrows[i], output_info, sub_lasts);
}
}
void
- Table::output(std::ostream& s, const vector<size_t>& widths) const
+ Table::output(std::ostream& s, const OutputInfo& output_info) const
{
s << string(global_indent, ' ');
- for (size_t i = 0; i < widths.size(); ++i)
+ for (size_t i = 0; i < output_info.widths.size(); ++i)
{
- for (size_t j = 0; j < widths[i]; ++j)
+ if (output_info.hidden[i])
+ continue;
+
+ for (size_t j = 0; j < output_info.widths[i]; ++j)
s << glyph(1);
- if (i == widths.size() - 1)
+ if (i == output_info.widths.size() - 1)
break;
s << glyph(1) << glyph(2) << glyph(1);
@@ -191,6 +242,18 @@
void
+ Table::set_visibility(Id id, Visibility visibility)
+ {
+ size_t i = id_to_index(id);
+
+ if (visibilities.size() < i + 1)
+ visibilities.resize(i + 1);
+
+ visibilities[i] = visibility;
+ }
+
+
+ void
Table::set_tree_id(Id id)
{
tree_index = id_to_index(id);
@@ -200,26 +263,20 @@
std::ostream&
operator<<(std::ostream& s, const Table& table)
{
- vector<size_t> widths = table.min_widths;
+ // calculate hidden and widths
- // calculate widths
-
- if (table.style != Style::NONE)
- table.calculate_widths(table.header, widths, 0);
-
- for (const Table::Row& row : table.rows)
- table.calculate_widths(row, widths, 0);
+ Table::OutputInfo output_info(table);
// output header and rows
if (table.style != Style::NONE)
{
- table.output(s, table.header, widths, {});
- table.output(s, widths);
+ table.output(s, table.header, output_info, {});
+ table.output(s, output_info);
}
for (const Table::Row& row : table.rows)
- table.output(s, row, widths, {});
+ table.output(s, row, output_info, {});
return s;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/barrel/Utils/Table.h
new/barrel-0.1.5/barrel/Utils/Table.h
--- old/barrel-0.1.4/barrel/Utils/Table.h 2022-01-11 10:37:02.000000000
+0100
+++ new/barrel-0.1.5/barrel/Utils/Table.h 2022-06-09 16:40:56.000000000
+0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 SUSE LLC
+ * Copyright (c) [2021-2022] SUSE LLC
*
* All Rights Reserved.
*
@@ -37,7 +37,7 @@
enum class Id
{
- NONE, NAME, SIZE, USAGE, POOL, USED, NUMBER, STRIPES, LABEL, MOUNT_POINT
+ NONE, NAME, SIZE, USAGE, POOL, USED, NUMBER, STRIPES, LABEL,
MOUNT_POINT, PROFILE
};
@@ -47,6 +47,12 @@
};
+ enum class Visibility
+ {
+ ON, AUTO, OFF
+ };
+
+
enum class Style
{
STANDARD, DOUBLE, ASCII, NONE
@@ -126,6 +132,7 @@
void set_style(enum Style style) { Table::style = style; }
void set_global_indent(size_t global_indent) { Table::global_indent =
global_indent; }
void set_min_width(Id id, size_t min_width);
+ void set_visibility(Id id, Visibility visibility);
void set_tree_id(Id id);
friend std::ostream& operator<<(std::ostream& s, const Table& Table);
@@ -141,16 +148,25 @@
vector<Align> aligns;
vector<Id> ids;
vector<size_t> min_widths;
+ vector<Visibility> visibilities;
size_t tree_index = 0;
size_t id_to_index(Id id) const;
- void calculate_widths(const Table::Row& row, vector<size_t>& widths,
unsigned indent) const;
+ struct OutputInfo
+ {
+ OutputInfo(const Table& table);
+
+ void calculate_hidden(const Table& table, const Table::Row& row);
+ void calculate_widths(const Table& table, const Table::Row& row,
unsigned indent);
+
+ vector<bool> hidden;
+ vector<size_t> widths;
+ };
- void output(std::ostream& s, const Table::Row& row, const
vector<size_t>& widths,
- const vector<bool>& lasts) const;
+ void output(std::ostream& s, const Table::Row& row, const OutputInfo&
output_info, const vector<bool>& lasts) const;
- void output(std::ostream& s, const vector<size_t>& widths) const;
+ void output(std::ostream& s, const OutputInfo& output_info) const;
const char* glyph(unsigned int i) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/barrel/create-filesystem.cc
new/barrel-0.1.5/barrel/create-filesystem.cc
--- old/barrel-0.1.4/barrel/create-filesystem.cc 2022-05-09
10:53:14.000000000 +0200
+++ new/barrel-0.1.5/barrel/create-filesystem.cc 2022-05-31
09:05:43.000000000 +0200
@@ -380,12 +380,28 @@
if (is_partition(blk_device))
{
- Partition* partition = to_partition(blk_device);
+ unsigned int id = ID_LINUX;
if (fs_type == FsType::SWAP)
- partition->set_id(ID_SWAP);
- else
- partition->set_id(ID_LINUX);
+ {
+ id = ID_SWAP;
+ }
+ else if (options.path)
+ {
+ // Requires SUSE parted 3.5 or higher.
+
+#if 0
+ const string& path = options.path.value();
+
+ if (path == "/home")
+ id = ID_LINUX_HOME;
+ else if (path == "/srv")
+ id = ID_LINUX_SERVER_DATA;
+#endif
+ }
+
+ Partition* partition = to_partition(blk_device);
+ partition->set_id(id);
}
state.stack.push(blk_filesystem);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/barrel/show-filesystems.cc
new/barrel-0.1.5/barrel/show-filesystems.cc
--- old/barrel-0.1.4/barrel/show-filesystems.cc 2022-02-23 16:03:30.000000000
+0100
+++ new/barrel-0.1.5/barrel/show-filesystems.cc 2022-06-09 16:40:56.000000000
+0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 SUSE LLC
+ * Copyright (c) [2021-2022] SUSE LLC
*
* All Rights Reserved.
*
@@ -25,6 +25,7 @@
#include <storage/Filesystems/MountPoint.h>
#include <storage/Filesystems/Filesystem.h>
#include <storage/Filesystems/BlkFilesystem.h>
+#include <storage/Filesystems/Btrfs.h>
#include <storage/Filesystems/Nfs.h>
#include <storage/Storage.h>
@@ -120,8 +121,10 @@
sort(filesystems.begin(), filesystems.end(), compare_by_something);
Table table({ _("Type"), Cell(_("Label"), Id::LABEL), Cell(_("Name"),
Id::NAME),
- Cell(_("Size"), Id::SIZE, Align::RIGHT), Cell(_("Mount Point"),
Id::MOUNT_POINT) });
+ Cell(_("Size"), Id::SIZE, Align::RIGHT), Cell(_("Profile"),
Id::PROFILE),
+ Cell(_("Mount Point"), Id::MOUNT_POINT) });
table.set_tree_id(Id::NAME);
+ table.set_visibility(Id::PROFILE, Visibility::AUTO);
for (const Filesystem* filesystem : filesystems)
{
@@ -155,6 +158,20 @@
row.add_subrow(subrow);
}
}
+
+ if (is_btrfs(blk_filesystem))
+ {
+ const Btrfs* btrfs = to_btrfs(blk_filesystem);
+
+ BtrfsRaidLevel data_raid_level =
btrfs->get_data_raid_level();
+ BtrfsRaidLevel metadata_raid_level =
btrfs->get_metadata_raid_level();
+
+ string tmp = get_btrfs_raid_level_name(data_raid_level);
+ if (metadata_raid_level != data_raid_level)
+ tmp += ", " +
get_btrfs_raid_level_name(metadata_raid_level);
+
+ row[Id::PROFILE] = boost::to_lower_copy(tmp,
locale::classic());
+ }
}
else if (is_nfs(filesystem))
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/ca.po new/barrel-0.1.5/po/ca.po
--- old/barrel-0.1.4/po/ca.po 2022-05-10 10:54:23.000000000 +0200
+++ new/barrel-0.1.5/po/ca.po 2022-06-07 12:40:59.000000000 +0200
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-21 18:18+0100\n"
-"PO-Revision-Date: 2022-05-09 17:12+0000\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
+"PO-Revision-Date: 2022-06-03 16:13+0000\n"
"Last-Translator: David Medina <medi...@gmail.com>\n"
"Language-Team: Catalan <https://l10n.opensuse.org/projects/barrel/master/ca/>"
"\n"
@@ -19,6 +19,22 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr "Activa BitLocker %1$s a %2$s (%3$s) amb l'UUID %4$s..."
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr "Activa BitLocker a %1$s (%2$s) amb l'UUID %3$s..."
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr "Activa LUKS %1$s a %2$s (%3$s) amb l'UUID %4$s..."
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr "Activa LUKS a %1$s (%2$s) amb l'UUID %3$s..."
+
msgid "Activating..."
msgstr "Activant..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/da.po new/barrel-0.1.5/po/da.po
--- old/barrel-0.1.4/po/da.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/da.po 2022-06-03 15:02:19.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,6 +16,22 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/de.po new/barrel-0.1.5/po/de.po
--- old/barrel-0.1.4/po/de.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/de.po 2022-06-03 15:02:19.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: barrel\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
"PO-Revision-Date: 2022-03-04 18:12+0000\n"
"Last-Translator: Gemineo <vista...@gemineo.de>\n"
"Language-Team: German <https://l10n.opensuse.org/projects/barrel/master/de/";
@@ -18,6 +18,22 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr "Wird aktiviert..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/es.po new/barrel-0.1.5/po/es.po
--- old/barrel-0.1.4/po/es.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/es.po 2022-06-03 15:02:19.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
"PO-Revision-Date: 2022-03-03 21:12+0000\n"
"Last-Translator: Antonio Sim??n <anto...@trans-mission.com>\n"
"Language-Team: Spanish <https://l10n.opensuse.org/projects/barrel/master/es/";
@@ -19,6 +19,22 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr "Activando..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/fr.po new/barrel-0.1.5/po/fr.po
--- old/barrel-0.1.4/po/fr.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/fr.po 2022-06-03 15:02:19.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
"PO-Revision-Date: 2022-02-24 12:12+0000\n"
"Last-Translator: Sophie Leroy <sop...@stoquart.com>\n"
"Language-Team: French <https://l10n.opensuse.org/projects/barrel/master/fr/";
@@ -19,6 +19,22 @@
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr "Activation en cours..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/it.po new/barrel-0.1.5/po/it.po
--- old/barrel-0.1.4/po/it.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/it.po 2022-06-03 15:02:19.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
"PO-Revision-Date: 2022-03-04 18:12+0000\n"
"Last-Translator: Davide Aiello <davide.aie...@novilingulists.com>\n"
"Language-Team: Italian <https://l10n.opensuse.org/projects/barrel/master/it/";
@@ -19,6 +19,22 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr "Attivazione in corso..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/ja.po new/barrel-0.1.5/po/ja.po
--- old/barrel-0.1.4/po/ja.po 2022-05-10 10:54:23.000000000 +0200
+++ new/barrel-0.1.5/po/ja.po 2022-06-07 12:40:59.000000000 +0200
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
-"PO-Revision-Date: 2022-05-09 12:13+0000\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
+"PO-Revision-Date: 2022-06-04 00:13+0000\n"
"Last-Translator: Yasuhiko Kamata <belphe...@belbel.or.jp>\n"
"Language-Team: Japanese <https://l10n.opensuse.org/projects/barrel/master/ja/";
">\n"
@@ -19,6 +19,22 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr "%2$s (%3$s) ????????? BitLocker %1$s (UUID %4$s) ????????????..."
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr "%1$s (%2$s) ????????? BitLocker (UUID %3$s) ????????????..."
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr "%2$s (%3$s) ????????? LUKS %1$s (UUID %4$s) ????????????..."
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr "%1$s (%2$s) ????????? LUKS (UUID %3$s) ????????????..."
+
msgid "Activating..."
msgstr "????????????????????????..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/pt_BR.po new/barrel-0.1.5/po/pt_BR.po
--- old/barrel-0.1.4/po/pt_BR.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/pt_BR.po 2022-06-03 15:02:19.000000000 +0200
@@ -8,9 +8,9 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
-"PO-Revision-Date: 2022-02-27 17:12+0000\n"
-"Last-Translator: Rodrigo Macedo <rmsolucoeseminformat...@gmail.com>\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
+"PO-Revision-Date: 2022-05-27 15:13+0000\n"
+"Last-Translator: Luiz Fernando Ranghetti <elcheviv...@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://l10n.opensuse.org/projects/";
"barrel/master/pt_BR/>\n"
"Language: pt_BR\n"
@@ -20,6 +20,22 @@
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr "Ativando..."
@@ -50,9 +66,8 @@
msgid "Alias for 'create filesystem --type f2fs'"
msgstr "??lias de \"create filesystem --type f2fs\""
-#, fuzzy
msgid "Alias for 'create filesystem --type nilfs2'"
-msgstr "??lias de \"create filesystem --type ntfs\""
+msgstr "??lias de \"create filesystem --type nilfs2\""
msgid "Alias for 'create filesystem --type ntfs'"
msgstr "??lias de \"create filesystem --type ntfs\""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/zh_CN.po new/barrel-0.1.5/po/zh_CN.po
--- old/barrel-0.1.4/po/zh_CN.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/zh_CN.po 2022-06-03 15:02:19.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
"PO-Revision-Date: 2022-03-07 11:12+0000\n"
"Last-Translator: Grace Yu <grace...@excel-gits.com>\n"
"Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/barrel/";
@@ -20,6 +20,22 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr "????????????..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/po/zh_TW.po new/barrel-0.1.5/po/zh_TW.po
--- old/barrel-0.1.4/po/zh_TW.po 2022-05-09 10:53:14.000000000 +0200
+++ new/barrel-0.1.5/po/zh_TW.po 2022-06-03 15:02:19.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: barrel VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-09 10:34+0200\n"
+"POT-Creation-Date: 2022-06-03 14:37+0200\n"
"PO-Revision-Date: 2022-03-07 11:12+0000\n"
"Last-Translator: Grace Yu <grace...@excel-gits.com>\n"
"Language-Team: Chinese (Taiwan) <https://l10n.opensuse.org/projects/barrel/";
@@ -20,6 +20,22 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.9.1\n"
+#, c-format
+msgid "Activate BitLocker %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate BitLocker on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS %1$s on %2$s (%3$s) with UUID %4$s..."
+msgstr ""
+
+#, c-format
+msgid "Activate LUKS on %1$s (%2$s) with UUID %3$s..."
+msgstr ""
+
msgid "Activating..."
msgstr "????????????..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/barrel-0.1.4/testsuite/show1.cc
new/barrel-0.1.5/testsuite/show1.cc
--- old/barrel-0.1.4/testsuite/show1.cc 2022-01-11 10:37:02.000000000 +0100
+++ new/barrel-0.1.5/testsuite/show1.cc 2022-06-09 16:40:56.000000000 +0200
@@ -179,11 +179,11 @@
Args args({ "--dry-run", "--quiet", "show", "filesystems" });
vector<string> output = {
- "Type ??? Label ??? Name ??? Size ??? Mount Point",
-
"???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",
- "btrfs ??? ??? multiple devices ??? ???",
- " ??? ??? ??????/dev/sdc1 ??? 2.98 GiB ???",
- " ??? ??? ??????/dev/sdd1 ??? 2.98 GiB ???"
+ "Type ??? Label ??? Name ??? Size ??? Profile
??? Mount Point",
+
"???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",
+ "btrfs ??? ??? multiple devices ??? ??? single, raid1
???",
+ " ??? ??? ??????/dev/sdc1 ??? 2.98 GiB ???
???",
+ " ??? ??? ??????/dev/sdd1 ??? 2.98 GiB ???
???"
};
Testsuite testsuite;
