Skip to content
Snippets Groups Projects
Commit d02a1f18 authored by Jakub Janků's avatar Jakub Janků Committed by Frediano Ziglio
Browse files

gettext: fix ngettext usage


_() should not be used in conjunction with ngettext(),
otherwise it's impossible to properly translate the message into
languages that have multiple plural forms, such as Czech.

Additionally, spice-gtk must use dngettext instead of ngettext,
otherwise the translation strings are searched within a wrong domain.

Fix ngettext usage in usb-device-widget.c and
update the PO files accordingly.

Signed-off-by: default avatarJakub Janků <jjanku@redhat.com>
Acked-by: default avatarFrediano Ziglio <fziglio@redhat.com>
parent 15e06ead
No related branches found
No related tags found
No related merge requests found
Pipeline #31544 passed
......@@ -288,12 +288,9 @@ msgstr "Auswahl des USB-Geräts zum Weiterleiten"
#: src/usb-device-widget.c:393
#, c-format
msgid "Select USB devices to redirect (%d free channel)"
msgstr "Auswahl des USB-Geräts zum Weiterleiten (%d freier Kanal)"
#: src/usb-device-widget.c:394
#, c-format
msgid "Select USB devices to redirect (%d free channels)"
msgstr "Auswahl des USB-Geräts zum Weiterleiten (%d freie Kanäle)"
msgid_plural "Select USB devices to redirect (%d free channels)"
msgstr[0] "Auswahl des USB-Geräts zum Weiterleiten (%d freier Kanal)"
msgstr[1] "Auswahl des USB-Geräts zum Weiterleiten (%d freie Kanäle)"
#: src/usb-device-widget.c:411
msgid "Redirecting USB Device..."
......
......@@ -271,15 +271,12 @@ msgstr ""
msgid "Select USB devices to redirect"
msgstr ""
#: src/usb-device-widget.c:420
#: src/usb-device-widget.c:393
#, c-format
msgid "Select USB devices to redirect (%d free channel)"
msgstr ""
#: src/usb-device-widget.c:421
#, c-format
msgid "Select USB devices to redirect (%d free channels)"
msgstr ""
msgid_plural "Select USB devices to redirect (%d free channels)"
msgstr[0] ""
msgstr[1] ""
#: src/usb-device-widget.c:439
msgid "Redirecting USB Device..."
......
......@@ -16,6 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Poedit 1.8.8\n"
#: src/channel-main.c:1868
......@@ -286,15 +287,12 @@ msgstr "%s %s %s a %d-%d"
msgid "Select USB devices to redirect"
msgstr "Selezionare dispositivo USB da redirigere"
#: src/usb-device-widget.c:420
#: src/usb-device-widget.c:393
#, c-format
msgid "Select USB devices to redirect (%d free channel)"
msgstr "Selezionare dispositivo USB da redirigere (%d canale libero)"
#: src/usb-device-widget.c:421
#, c-format
msgid "Select USB devices to redirect (%d free channels)"
msgstr "Selezionare dispositivo USB da redirigere (%d canali liberi)"
msgid_plural "Select USB devices to redirect (%d free channels)"
msgstr[0] "Selezionare dispositivo USB da redirigere (%d canale libero)"
msgstr[1] "Selezionare dispositivo USB da redirigere (%d canali liberi)"
#: src/usb-device-widget.c:439
msgid "Redirecting USB Device..."
......
......@@ -390,9 +390,10 @@ static gboolean spice_usb_device_widget_update_status(gpointer user_data)
redirecting = spice_usb_device_manager_is_redirecting(priv->manager);
g_object_get(priv->manager, "free-channels", &free_channels, NULL);
free_channels_str = ngettext(_("Select USB devices to redirect (%d free channel)"),
_("Select USB devices to redirect (%d free channels)"),
free_channels);
free_channels_str = g_dngettext(GETTEXT_PACKAGE,
"Select USB devices to redirect (%d free channel)",
"Select USB devices to redirect (%d free channels)",
free_channels);
str = g_strdup_printf(free_channels_str, free_channels);
markup_str = g_strdup_printf("<b>%s</b>", str);
gtk_label_set_markup(GTK_LABEL (priv->label), markup_str);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment