Do not concatenate translated strings and fix typo in CONTRIBUTING.md

Author: msirringhaus

CONTRIBUTING.md

@@ -205,9 +205,9 @@ Then `cd` into your build-directory (e.g. `build/`) and run
 
 ```
     # To update the POT template file, in case new strings have been added in the sources
-    meson compile credentialds-ui-pot
+    meson compile credentialsd-ui-pot
     # and to update the individual language files
-    meson compile credentialds-ui-update-po
+    meson compile credentialsd-ui-update-po
 ```
 to update the template, so it contains all messages to be translated.
 

credentialsd-ui/po/credentialsd-ui.pot

@@ -1,6 +1,9 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2025-10-13 11:55+0200\n"
+"Project-Id-Version: credentialsd-ui\n"
+"Report-Msgid-Bugs-To: \"https://github.com/linux-credentials/credentialsd/"
+"issues\"\n"
+"POT-Creation-Date: 2025-10-24 08:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: \n"
@@ -114,16 +117,16 @@ msgid ""
 "or use a different authenticator."
 msgstr ""
 
-#: src/gui/view_model/gtk/mod.rs:137
-msgid "Enter your PIN."
-msgstr ""
-
-#: src/gui/view_model/gtk/mod.rs:140
-msgid "One attempt remaining."
-msgid_plural "%d attempts remaining."
+#: src/gui/view_model/gtk/mod.rs:139
+msgid "Enter your PIN. One attempt remaining."
+msgid_plural "Enter your PIN. %d attempts remaining."
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/gui/view_model/gtk/mod.rs:145
+msgid "Enter your PIN."
+msgstr ""
+
 #: src/gui/view_model/gtk/mod.rs:154
 msgid "Touch your device again. One attempt remaining."
 msgid_plural "Touch your device again. %d attempts remaining."

credentialsd-ui/po/de_DE.po

@@ -1,7 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-10-10 14:45+0200\n"
+"Report-Msgid-Bugs-To: \"https://github.com/linux-credentials/credentialsd/"
+"issues\"\n"
+"POT-Creation-Date: 2025-10-24 08:05+0200\n"
 "PO-Revision-Date: 2025-10-10 14:45+0200\n"
 "Last-Translator: Martin Sirringhaus <martin.sirringhaus@suse.com>\n"
 "Language: de_DE\n"
@@ -14,7 +16,7 @@ msgstr ""
 #. <project_license>LGPL-3.0-only</project_license>
 #: data/xyz.iinuwa.credentialsd.CredentialsUi.desktop.in.in:2
 #: data/xyz.iinuwa.credentialsd.CredentialsUi.metainfo.xml.in.in:8
-#: src/gui/view_model/gtk/mod.rs:370
+#: src/gui/view_model/gtk/mod.rs:372
 msgid "Credential Manager"
 msgstr "Zugangsdatenmanager"
 
@@ -43,8 +45,7 @@ msgstr "Fenster maximiert"
 msgid ""
 "A boilerplate template for GTK + Rust. It uses Meson as a build system and "
 "has flatpak support by default."
-msgstr ""
-"Eine Vorlage für eine GTK + Rust Anwendung."
+msgstr "Eine Vorlage für eine GTK + Rust Anwendung."
 
 #: data/xyz.iinuwa.credentialsd.CredentialsUi.metainfo.xml.in.in:16
 msgid "Registering a credential"
@@ -113,16 +114,17 @@ msgstr ""
 "Beim Abrufen Ihrer Zugangsdaten ist ein Fehler aufgetreten. Versuchen Sie es "
 "später wieder, oder verwenden Sie einen anderen Security-Token."
 
-#: src/gui/view_model/gtk/mod.rs:137
+#: src/gui/view_model/gtk/mod.rs:139
+#, fuzzy
+msgid "Enter your PIN. One attempt remaining."
+msgid_plural "Enter your PIN. %d attempts remaining."
+msgstr[0] "Geben Sie Ihren PIN ein. Sie haben nur noch einen Versuch."
+msgstr[1] "Geben Sie Ihren PIN ein. Sie haben noch %d Versuche."
+
+#: src/gui/view_model/gtk/mod.rs:145
 msgid "Enter your PIN."
 msgstr "Geben Sie Ihren PIN ein."
 
-#: src/gui/view_model/gtk/mod.rs:140
-msgid "One attempt remaining."
-msgid_plural "%d attempts remaining."
-msgstr[0] "Sie haben nur noch einen Versuch."
-msgstr[1] "Sie haben noch %d Versuche."
-
 #: src/gui/view_model/gtk/mod.rs:154
 msgid "Touch your device again. One attempt remaining."
 msgid_plural "Touch your device again. %d attempts remaining."
@@ -139,14 +141,16 @@ msgstr "Berühren Sie Ihr Gerät."
 
 #: src/gui/view_model/gtk/mod.rs:168
 msgid "Scan the QR code with your device to begin authentication."
-msgstr "Scannen Sie den QR code mit ihrem Gerät um die Authentifizierung zu beginnen."
+msgstr ""
+"Scannen Sie den QR code mit ihrem Gerät um die Authentifizierung zu beginnen."
 
 #: src/gui/view_model/gtk/mod.rs:178
 msgid ""
 "Connecting to your device. Make sure both devices are near each other and "
 "have Bluetooth enabled."
 msgstr ""
-"Verbindung zu Ihrem Gerät wird aufgebaut. Stellen Sie sicher, dass beide Geräte nah beieinander sind und Bluetooth aktiviert haben."
+"Verbindung zu Ihrem Gerät wird aufgebaut. Stellen Sie sicher, dass beide "
+"Geräte nah beieinander sind und Bluetooth aktiviert haben."
 
 #: src/gui/view_model/gtk/mod.rs:186
 msgid "Device connected. Follow the instructions on your device"
@@ -204,7 +208,9 @@ msgstr "Keine passenden Zugangsdaten auf diesem Gerät gefunden."
 msgid ""
 "No more PIN attempts allowed. Try removing your device and plugging it back "
 "in."
-msgstr "Keine weiteren PIN-Eingaben erlaubt. Versuchen Sie ihr Gerät aus- und wieder einzustecken."
+msgstr ""
+"Keine weiteren PIN-Eingaben erlaubt. Versuchen Sie ihr Gerät aus- und wieder "
+"einzustecken."
 
 #: src/gui/view_model/mod.rs:236
 msgid "This credential is already registered on this authenticator."

credentialsd-ui/po/en_US.po

@@ -1,6 +1,8 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2025-10-10 14:45+0200\n"
+"Report-Msgid-Bugs-To: \"https://github.com/linux-credentials/credentialsd/"
+"issues\"\n"
+"POT-Creation-Date: 2025-10-24 08:05+0200\n"
 "PO-Revision-Date: 2025-10-10 14:45+0200\n"
 "Last-Translator: Martin Sirringhaus <martin.sirringhaus@suse.com>\n"
 "Language: en_US\n"
@@ -13,7 +15,7 @@ msgstr ""
 #. <project_license>LGPL-3.0-only</project_license>
 #: data/xyz.iinuwa.credentialsd.CredentialsUi.desktop.in.in:2
 #: data/xyz.iinuwa.credentialsd.CredentialsUi.metainfo.xml.in.in:8
-#: src/gui/view_model/gtk/mod.rs:370
+#: src/gui/view_model/gtk/mod.rs:372
 msgid "Credential Manager"
 msgstr "Credential Manager"
 
@@ -50,11 +52,6 @@ msgstr ""
 msgid "Registering a credential"
 msgstr "Registering a credential"
 
-#. developer_name tag deprecated with Appstream 1.0
-#: data/xyz.iinuwa.credentialsd.CredentialsUi.metainfo.xml.in.in:34
-msgid "Isaiah Inuwa"
-msgstr "Isaiah Inuwa"
-
 #: data/resources/ui/shortcuts.ui:11
 msgctxt "shortcut window"
 msgid "General"
@@ -118,16 +115,17 @@ msgstr ""
 "Something went wrong while retrieving a credential. Please try again later "
 "or use a different authenticator."
 
-#: src/gui/view_model/gtk/mod.rs:137
+#: src/gui/view_model/gtk/mod.rs:139
+#, fuzzy
+msgid "Enter your PIN. One attempt remaining."
+msgid_plural "Enter your PIN. %d attempts remaining."
+msgstr[0] "Enter your PIN. One attempt remaining."
+msgstr[1] "Enter your PIN. %d attempts remaining."
+
+#: src/gui/view_model/gtk/mod.rs:145
 msgid "Enter your PIN."
 msgstr "Enter your PIN."
 
-#: src/gui/view_model/gtk/mod.rs:140
-msgid "One attempt remaining."
-msgid_plural "%d attempts remaining."
-msgstr[0] "One attempt remaining."
-msgstr[1] "%d attempts remaining."
-
 #: src/gui/view_model/gtk/mod.rs:154
 msgid "Touch your device again. One attempt remaining."
 msgid_plural "Touch your device again. %d attempts remaining."
@@ -220,4 +218,5 @@ msgstr "This credential is already registered on this authenticator."
 
 #: src/gui/view_model/mod.rs:284
 msgid "Something went wrong. Try again later or use a different authenticator."
-msgstr "Something went wrong. Try again later or use a different authenticator."
+msgstr ""
+"Something went wrong. Try again later or use a different authenticator."

credentialsd-ui/src/gui/view_model/gtk/mod.rs

@@ -134,16 +134,16 @@ impl ViewModel {
                                     view_model.waiting_for_device(&device)
                                 }
                                 ViewUpdate::UsbNeedsPin { attempts_left } => {
-                                    let mut prompt = gettext("Enter your PIN.");
-                                    if let Some(left) = attempts_left {
+                                    let prompt = if let Some(left) = attempts_left {
                                         let localized = ngettext(
-                                            "One attempt remaining.",
-                                            "%d attempts remaining.",
+                                            "Enter your PIN. One attempt remaining.",
+                                            "Enter your PIN. %d attempts remaining.",
                                             left,
                                         );
-                                        prompt.push(' ');
-                                        prompt += &localized.replace("%d", &format!("{}", left));
-                                    }
+                                        localized.replace("%d", &format!("{}", left))
+                                    } else {
+                                        gettext("Enter your PIN.")
+                                    };
                                     view_model.set_prompt(prompt);
                                     view_model.set_usb_pin_entry_visible(true);
                                 }