fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 22:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ih/fix_gettext'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1821
This commit is contained in:
Íñigo Huguet 2023-12-18 15:54:47 +01:00
commit f58533fe24
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitlab-ci.yml
View file

@ -57,11 +57,11 @@ variables:
# #
# This is done by running `ci-fairy generate-template` and possibly bumping # This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag". # ".default_tag".
ALPINE_TAG: 'tag-b51da9e3f95a' ALPINE_TAG: 'tag-7da44bbacc09'
CENTOS_TAG: 'tag-c89e0aac1363' CENTOS_TAG: 'tag-c8090b8a9a6b'
DEBIAN_TAG: 'tag-76973ff363a5' DEBIAN_TAG: 'tag-86a16c2d74d8'
FEDORA_TAG: 'tag-c89e0aac1363' FEDORA_TAG: 'tag-c8090b8a9a6b'
UBUNTU_TAG: 'tag-76973ff363a5' UBUNTU_TAG: 'tag-86a16c2d74d8'
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
CENTOS_EXEC: 'bash .gitlab-ci/fedora-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'; 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'; 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'; 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: pages:
stage: deploy stage: deploy

1
.gitlab-ci/ci.template
View file

@ -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'; 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'; 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'; 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: pages:
stage: deploy stage: deploy

2
po/id.po
View file

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

5
src/core/main-utils.c
View file

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