Merge branch 'ih/fix_gettext'

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1821

.gitlab-ci.yml

@@ -57,11 +57,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
-  ALPINE_TAG:  'tag-b51da9e3f95a'
-  CENTOS_TAG:  'tag-c89e0aac1363'
-  DEBIAN_TAG:  'tag-76973ff363a5'
-  FEDORA_TAG:  'tag-c89e0aac1363'
-  UBUNTU_TAG:  'tag-76973ff363a5'
+  ALPINE_TAG:  'tag-7da44bbacc09'
+  CENTOS_TAG:  'tag-c8090b8a9a6b'
+  DEBIAN_TAG:  'tag-86a16c2d74d8'
+  FEDORA_TAG:  'tag-c8090b8a9a6b'
+  UBUNTU_TAG:  'tag-86a16c2d74d8'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -710,6 +710,7 @@ check-tree:
     - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc
     - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n
     - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code
+    - date '+%Y%m%d-%H%M%S'; ./autogen.sh && [ "$(LANG=C make -C po update-po 2>&1 1>/dev/null | grep -c 'warning:')" = 0 ]
 
 pages:
   stage: deploy

.gitlab-ci/ci.template

@@ -209,6 +209,7 @@ check-tree:
     - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc
     - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n
     - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code
+    - date '+%Y%m%d-%H%M%S'; ./autogen.sh && [ "$(LANG=C make -C po update-po 2>&1 1>/dev/null | grep -c 'warning:')" = 0 ]
 
 pages:
   stage: deploy

po/id.po

@@ -13755,7 +13755,7 @@ msgstr ""
 "  'conf'        Memuat ulang konfigurasi NetworkManager.conf dari disk.\n"
 "                Perhatikan bahwa ini tidak termasuk koneksi, yang dapat\n"
 "                dimuat ulang melalui 'nmcli connection reload' "
-"sebagai\v                gantinya.\n"
+"                gantinya.\n"
 "\n"
 "  'dns-rc'      Memperbarui konfigurasi DNS, yang biasanya melibatkan\n"
 "                penulisan /etc/resolv.conf baru.\n"

src/core/main-utils.c

@@ -192,10 +192,7 @@ nm_main_utils_ensure_not_running_pidfile(const char *pidfile)
     if (strcmp(process_name, prgname) == 0) {
         /* Check that the process exists */
         if (kill(pid, 0) == 0) {
-            fprintf(stderr,
-                    _("%s is already running (pid %" G_GINT64_FORMAT ")\n"),
-                    prgname,
-                    (gint64) pid);
+            fprintf(stderr, _("%s is already running (pid %lld)\n"), prgname, (long long) pid);
             exit(1);
         }
     }