From d719bab9f7cd745987e6a28dd02a579957cbe97f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 19:02:12 +0100 Subject: [PATCH 1/8] gitlab-ci: rename "build.sh" script to "run-test.sh" It's true, that our gitlab-ci test mostly consists of building NetworkManager. Hence the name of the script was not entirely wrong. But it's not only building. I think "run-test.sh" is a much better name. Rename. --- .gitlab-ci.yml | 12 ++++++------ .gitlab-ci/ci.template | 2 +- .gitlab-ci/{build.sh => run-test.sh} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename .gitlab-ci/{build.sh => run-test.sh} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc64355104..9e2a2c31fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2022-03-15.0-9d8288d70d58' - UBUNTU_TAG: '2022-03-15.0-c933c3fced1c' - DEBIAN_TAG: '2022-03-15.0-c933c3fced1c' - CENTOS_TAG: '2022-03-15.0-9d8288d70d58' - ALPINE_TAG: '2022-03-15.0-499639d17df6' + FEDORA_TAG: '2022-03-15.0-1c8fb45999e9' + UBUNTU_TAG: '2022-03-15.0-f7d56c5dcd47' + DEBIAN_TAG: '2022-03-15.0-f7d56c5dcd47' + CENTOS_TAG: '2022-03-15.0-1c8fb45999e9' + ALPINE_TAG: '2022-03-15.0-91803105505b' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -622,7 +622,7 @@ alpine:latest@container-clean: .build@template: stage: test script: - - .gitlab-ci/build.sh + - .gitlab-ci/run-test.sh dependencies: [] ################################################################# diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 20ffe286b2..9e6a2c1790 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -144,7 +144,7 @@ variables: .build@template: stage: test script: - - .gitlab-ci/build.sh + - .gitlab-ci/run-test.sh dependencies: [] ################################################################# diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/run-test.sh similarity index 100% rename from .gitlab-ci/build.sh rename to .gitlab-ci/run-test.sh From bbd053bf8362f96244b3db55f37209e527322353 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 21:25:44 +0100 Subject: [PATCH 2/8] gitlab-ci: print environment variables not part of run-test.sh script The output of our test scripts is captured by gitlab. It does however sanitize things that look like secrets. So it was reasonably save to call `env` from within the test script. Next, we will redirect (`tee`) the output of the test script to a file and archive it. When we do that, the output does not get sanitized and can be downloaded from the artifacts page. Stop running `env` as part of the test script. Do it instead as a separate step. After all, it is useful to see the environment variables of the test. But sanitized. --- .gitlab-ci.yml | 11 ++++++----- .gitlab-ci/ci.template | 1 + .gitlab-ci/run-test.sh | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e2a2c31fb..33333549b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2022-03-15.0-1c8fb45999e9' - UBUNTU_TAG: '2022-03-15.0-f7d56c5dcd47' - DEBIAN_TAG: '2022-03-15.0-f7d56c5dcd47' - CENTOS_TAG: '2022-03-15.0-1c8fb45999e9' - ALPINE_TAG: '2022-03-15.0-91803105505b' + FEDORA_TAG: '2022-03-15.0-fb4fc6b5dff6' + UBUNTU_TAG: '2022-03-15.0-6b7641ec0d2b' + DEBIAN_TAG: '2022-03-15.0-6b7641ec0d2b' + CENTOS_TAG: '2022-03-15.0-fb4fc6b5dff6' + ALPINE_TAG: '2022-03-15.0-f6b3036d4e95' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -622,6 +622,7 @@ alpine:latest@container-clean: .build@template: stage: test script: + - env - .gitlab-ci/run-test.sh dependencies: [] diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 9e6a2c1790..4629c7effe 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -144,6 +144,7 @@ variables: .build@template: stage: test script: + - env - .gitlab-ci/run-test.sh dependencies: [] diff --git a/.gitlab-ci/run-test.sh b/.gitlab-ci/run-test.sh index a183aa1f07..c826dd078b 100755 --- a/.gitlab-ci/run-test.sh +++ b/.gitlab-ci/run-test.sh @@ -15,7 +15,6 @@ do_clean() { uname -a ! command -v locale &>/dev/null || locale -a -env meson --version ! command -v dpkg &>/dev/null || dpkg -l From 569b9d864ff160de7be5b14f5f45d50963270144 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 13:48:15 +0100 Subject: [PATCH 3/8] gitlab-ci: archive log of test Our test is long and verbose. The output gets truncated after a few megabytes, but sometimes it's interesting to see what happens afterwards. Redirect also to a file and archive it. --- .gitlab-ci.yml | 53 ++++++++++++++++++++++++++++++++++++------ .gitlab-ci/ci.template | 20 ++++++++++++++-- 2 files changed, 64 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33333549b1..7896323f20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2022-03-15.0-fb4fc6b5dff6' - UBUNTU_TAG: '2022-03-15.0-6b7641ec0d2b' - DEBIAN_TAG: '2022-03-15.0-6b7641ec0d2b' - CENTOS_TAG: '2022-03-15.0-fb4fc6b5dff6' - ALPINE_TAG: '2022-03-15.0-f6b3036d4e95' + FEDORA_TAG: '2022-03-15.0-6be5ac812004' + UBUNTU_TAG: '2022-03-15.0-34b078846bf1' + DEBIAN_TAG: '2022-03-15.0-34b078846bf1' + CENTOS_TAG: '2022-03-15.0-6be5ac812004' + ALPINE_TAG: '2022-03-15.0-5dc0a455ed5c' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -63,11 +63,20 @@ variables: variables: NM_BUILD_TARBALL: 1 artifacts: - expire_in: 2 days + expire_in: 5 days + when: always paths: - docs-html - NetworkManager-1*.tar.xz - NetworkManager-1*.src.rpm + - nm-test.log + +.nm_artifacts_debug: + artifacts: + expire_in: 5 days + when: always + paths: + - nm-test.log .nm_artifacts_undo: variables: @@ -623,9 +632,12 @@ alpine:latest@container-clean: stage: test script: - env - - .gitlab-ci/run-test.sh + - .gitlab-ci/run-test.sh 2>&1 | tee /tmp/nm-test.log + after_script: + - mv /tmp/nm-test.log . dependencies: [] + ################################################################# # # # test stage # @@ -637,6 +649,7 @@ t_fedora:30: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '30' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -648,6 +661,7 @@ t_fedora:31: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '31' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -659,6 +673,7 @@ t_fedora:32: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -670,6 +685,7 @@ t_fedora:33: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -681,6 +697,7 @@ t_fedora:34: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -703,6 +720,7 @@ t_fedora:36: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '36' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -714,6 +732,7 @@ t_ubuntu:16.04: extends: - .build@template - .fdo.distribution-image@ubuntu + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '16.04' FDO_DISTRIBUTION_TAG: $UBUNTU_TAG @@ -725,6 +744,7 @@ t_ubuntu:18.04: extends: - .build@template - .fdo.distribution-image@ubuntu + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '18.04' FDO_DISTRIBUTION_TAG: $UBUNTU_TAG @@ -736,6 +756,7 @@ t_ubuntu:20.04: extends: - .build@template - .fdo.distribution-image@ubuntu + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '20.04' FDO_DISTRIBUTION_TAG: $UBUNTU_TAG @@ -747,6 +768,7 @@ t_ubuntu:devel: extends: - .build@template - .fdo.distribution-image@ubuntu + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'devel' FDO_DISTRIBUTION_TAG: $UBUNTU_TAG @@ -758,6 +780,7 @@ t_ubuntu:rolling: extends: - .build@template - .fdo.distribution-image@ubuntu + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'rolling' FDO_DISTRIBUTION_TAG: $UBUNTU_TAG @@ -769,6 +792,7 @@ t_debian:9: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '9' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -780,6 +804,7 @@ t_debian:10: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '10' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -791,6 +816,7 @@ t_debian:11: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '11' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -802,6 +828,7 @@ t_debian:testing: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'testing' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -813,6 +840,7 @@ t_debian:sid: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'sid' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -824,6 +852,7 @@ t_centos:7.5.1804: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '7.5.1804' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -835,6 +864,7 @@ t_centos:7.6.1810: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '7.6.1810' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -846,6 +876,7 @@ t_centos:7.7.1908: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '7.7.1908' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -857,6 +888,7 @@ t_centos:7.8.2003: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '7.8.2003' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -868,6 +900,7 @@ t_centos:7.9.2009: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '7.9.2009' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -879,6 +912,7 @@ t_centos:8.1.1911: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '8.1.1911' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -890,6 +924,7 @@ t_centos:8.2.2004: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '8.2.2004' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -901,6 +936,7 @@ t_centos:8.3.2011: extends: - .build@template - .fdo.distribution-image@centos + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '8.3.2011' FDO_DISTRIBUTION_TAG: $CENTOS_TAG @@ -912,6 +948,7 @@ t_alpine:latest: extends: - .build@template - .fdo.distribution-image@alpine + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_TAG: $ALPINE_TAG @@ -932,6 +969,7 @@ check-patch: stage: test script: - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh + after_script: allow_failure: true check-tree: @@ -944,6 +982,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 + after_script: pages: stage: deploy diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 4629c7effe..d42d2d186f 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -52,11 +52,20 @@ variables: variables: NM_BUILD_TARBALL: 1 artifacts: - expire_in: 2 days + expire_in: 5 days + when: always paths: - docs-html - NetworkManager-1*.tar.xz - NetworkManager-1*.src.rpm + - nm-test.log + +.nm_artifacts_debug: + artifacts: + expire_in: 5 days + when: always + paths: + - nm-test.log .nm_artifacts_undo: variables: @@ -145,9 +154,12 @@ variables: stage: test script: - env - - .gitlab-ci/run-test.sh + - .gitlab-ci/run-test.sh 2>&1 | tee /tmp/nm-test.log + after_script: + - mv /tmp/nm-test.log . dependencies: [] + ################################################################# # # # test stage # @@ -164,6 +176,8 @@ t_{{distro.name}}:{{version}}: {% if distro.name == pages_build.name and version == pages_build.version %} - .nm_artifacts +{% else %} + - .nm_artifacts_debug {% endif %} variables: FDO_DISTRIBUTION_VERSION: '{{version}}' @@ -195,6 +209,7 @@ check-patch: stage: test script: - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh + after_script: allow_failure: true check-tree: @@ -207,6 +222,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 + after_script: pages: stage: deploy From e7219074727790ce54c14cd9e650784f2c1b7c21 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 20:50:54 +0100 Subject: [PATCH 4/8] gitlab-ci: rework extends: for "check-{patch,tree}" jobs The "check-{patch,tree}" jobs use the same container as the default test on Fedora ("pages_build", which also builds our documentation). Previously, we thus extended "t_fedora:35". But that way we also got things that we didn't want (.nm_artifacts and .build@template). Solve this differently, by letting the jobs directly define what they need. It's not much more, than extending "t_fedora:35" and workaround to drop stuff we don't want. --- .gitlab-ci.yml | 34 +++++++++++++++++----------------- .gitlab-ci/ci.template | 24 ++++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7896323f20..9d6c942f09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2022-03-15.0-6be5ac812004' - UBUNTU_TAG: '2022-03-15.0-34b078846bf1' - DEBIAN_TAG: '2022-03-15.0-34b078846bf1' - CENTOS_TAG: '2022-03-15.0-6be5ac812004' - ALPINE_TAG: '2022-03-15.0-5dc0a455ed5c' + FEDORA_TAG: '2022-03-15.0-fe6b35cace78' + UBUNTU_TAG: '2022-03-15.0-ad509d98bfc2' + DEBIAN_TAG: '2022-03-15.0-ad509d98bfc2' + CENTOS_TAG: '2022-03-15.0-fe6b35cace78' + ALPINE_TAG: '2022-03-15.0-913fc0767f1d' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -78,12 +78,6 @@ variables: paths: - nm-test.log -.nm_artifacts_undo: - variables: - NM_BUILD_TARBALL: 0 - artifacts: - paths: [] - ################################################################# # # # containers stage # @@ -964,25 +958,31 @@ t_alpine:latest: check-patch: extends: - - t_fedora:35 - - .nm_artifacts_undo + - .fdo.distribution-image@fedora + variables: + FDO_DISTRIBUTION_VERSION: '35' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + needs: + - "fedora:35@container-prep" stage: test script: - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh - after_script: allow_failure: true check-tree: extends: - - t_fedora:35 - - .nm_artifacts_undo + - .fdo.distribution-image@fedora + variables: + FDO_DISTRIBUTION_VERSION: '35' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + needs: + - "fedora:35@container-prep" stage: test script: - date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set - 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 - after_script: pages: stage: deploy diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index d42d2d186f..092fffcdaa 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -67,12 +67,6 @@ variables: paths: - nm-test.log -.nm_artifacts_undo: - variables: - NM_BUILD_TARBALL: 0 - artifacts: - paths: [] - ################################################################# # # # containers stage # @@ -204,25 +198,31 @@ t_{{distro.name}}:{{version}}: check-patch: extends: - - t_{{pages_build.name}}:{{pages_build.version}} - - .nm_artifacts_undo + - .fdo.distribution-image@{{pages_build.name}} + variables: + FDO_DISTRIBUTION_VERSION: '{{pages_build.version}}' + FDO_DISTRIBUTION_TAG: ${{pages_build.name.upper()}}_TAG + needs: + - "{{pages_build.name}}:{{pages_build.version}}@container-prep" stage: test script: - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh - after_script: allow_failure: true check-tree: extends: - - t_{{pages_build.name}}:{{pages_build.version}} - - .nm_artifacts_undo + - .fdo.distribution-image@{{pages_build.name}} + variables: + FDO_DISTRIBUTION_VERSION: '{{pages_build.version}}' + FDO_DISTRIBUTION_TAG: ${{pages_build.name.upper()}}_TAG + needs: + - "{{pages_build.name}}:{{pages_build.version}}@container-prep" stage: test script: - date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set - 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 - after_script: pages: stage: deploy From 85ceffceb95fbceb19cd8994b17115989c587ee5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 11:22:54 +0100 Subject: [PATCH 5/8] contrib/rpm: don't package TODO file Our TODO file is not well maintained. Don't package it. --- contrib/fedora/rpm/NetworkManager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index c1ae0f0a74..2aac3396b4 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -1092,7 +1092,7 @@ fi %{_unitdir}/nm-priv-helper.service %dir %{_datadir}/doc/NetworkManager/examples %{_datadir}/doc/NetworkManager/examples/server.conf -%doc NEWS AUTHORS README CONTRIBUTING.md TODO +%doc NEWS AUTHORS README CONTRIBUTING.md %license COPYING %license COPYING.LGPL %license COPYING.GFDL From 1c76c11b4200400b99d9075fbdd43a9d5738b1d4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 11:22:05 +0100 Subject: [PATCH 6/8] doc: rename "README" to "README.md" By having a ".md" extension, gitlab renders a nice page instead of showing as plain text. Currently our README is pretty bad. Partly, because it doesn't get shown nicely. Rename. The file effectively was already markdown. The old file is gone. For this we also need to change the automake flavor to "foreign" (See [1]). [1] https://autotools.info/automake/options.html#automake.options.flavors --- Makefile.am | 7 +++++++ README => README.md | 0 configure.ac | 2 +- contrib/fedora/rpm/NetworkManager.spec | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) rename README => README.md (100%) diff --git a/Makefile.am b/Makefile.am index 4d9c4e7a7f..760b46b97a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5578,6 +5578,13 @@ plugin_LTLIBRARIES += $(core_plugins) TESTS += $(check_programs) EXTRA_DIST += \ + \ + AUTHORS \ + COPYING \ + ChangeLog \ + NEWS \ + README.md \ + \ CONTRIBUTING.md \ COPYING.LGPL \ COPYING.GFDL \ diff --git a/README b/README.md similarity index 100% rename from README rename to README.md diff --git a/configure.ac b/configure.ac index 3874a5d5ba..42441a6525 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) -AM_INIT_AUTOMAKE(1.12 tar-ustar no-dist-gzip dist-xz -Wno-portability) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(1.12 foreign tar-ustar no-dist-gzip dist-xz -Wno-portability) dnl NB: Do not [quote] this parameter. AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 2aac3396b4..50d5d31ae8 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -1092,7 +1092,7 @@ fi %{_unitdir}/nm-priv-helper.service %dir %{_datadir}/doc/NetworkManager/examples %{_datadir}/doc/NetworkManager/examples/server.conf -%doc NEWS AUTHORS README CONTRIBUTING.md +%doc NEWS AUTHORS README.md CONTRIBUTING.md %license COPYING %license COPYING.LGPL %license COPYING.GFDL From e8b309e4ef27b54517c7eb0e2f2ae23e132361d6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 19:49:52 +0100 Subject: [PATCH 7/8] po: update "Project-Id-Version" for po files `msgfmt -vc` warns: po/as.po:9: warning: header field 'Project-Id-Version' still has the initial default value Update them all: $ git grep -l Project-Id-Version | xargs sed 's/^"Project-Id-Version: \(.*\)\\n"$/"Project-Id-Version: NetworkManager\\n"/' -i The documentation ([1]) says: Project-Id-Version This is the name and version of the package. Fill it in if it has not already been filled in by xgettext. but don't add the "version". We have these files in git on the devel branch, so whenever we branch a new release, the version would change. Just say "NetworkManager". [1] https://www.gnu.org/software/gettext/manual/html_node/Header-Entry.html --- po/as.po | 2 +- po/be@latin.po | 2 +- po/bg.po | 2 +- po/bn_IN.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/dz.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/eo.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gd.po | 2 +- po/gl.po | 2 +- po/gu.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/kn.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/oc.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pt.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/rw.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sq.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_HK.po | 2 +- po/zh_TW.po | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/po/as.po b/po/as.po index b94c2e3679..b423a2ef1d 100644 --- a/po/as.po +++ b/po/as.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:06-0400\n" diff --git a/po/be@latin.po b/po/be@latin.po index c414dabb93..c5b77f354a 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: network-manager-ui\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2008-03-29 21:43+0200\n" diff --git a/po/bg.po b/po/bg.po index 4eb2f42da0..c5646952c5 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:07-0400\n" diff --git a/po/bn_IN.po b/po/bn_IN.po index 17316073e6..c48718dcc0 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:09-0400\n" diff --git a/po/bs.po b/po/bs.po index 8f91e1b9f4..46fea4de76 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:12-0400\n" diff --git a/po/ca.po b/po/ca.po index e676ac5326..e9a4404f24 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11,7 +11,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:12-0400\n" diff --git a/po/cs.po b/po/cs.po index 60432bb34c..1774c0d1dc 100644 --- a/po/cs.po +++ b/po/cs.po @@ -14,7 +14,7 @@ # Daniel Rusek , 2018. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2018-09-30 14:02+0200\n" diff --git a/po/da.po b/po/da.po index 19aec9b817..b71ebb4348 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ # msgid "" msgstr "" -"Project-Id-Version: NetworkManager master\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2020-12-30 00:00+0200\n" diff --git a/po/de.po b/po/de.po index 777f563d18..8aaff52a52 100644 --- a/po/de.po +++ b/po/de.po @@ -21,7 +21,7 @@ # maxbachmann , 2019 msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2018-07-15 17:31+0200\n" diff --git a/po/dz.po b/po/dz.po index 3b206d2c63..d6ec2ad79b 100644 --- a/po/dz.po +++ b/po/dz.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: networkmanager.networkmanager-0-6-0-release.pot\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2007-03-20 10:17+0530\n" diff --git a/po/el.po b/po/el.po index 8ec457941a..b0dd35f058 100644 --- a/po/el.po +++ b/po/el.po @@ -12,7 +12,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-05-29 11:19-0400\n" diff --git a/po/en_GB.po b/po/en_GB.po index cce756bb9b..2483280b2d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:17-0400\n" diff --git a/po/eo.po b/po/eo.po index d3e3e93c89..9e3836aea1 100644 --- a/po/eo.po +++ b/po/eo.po @@ -11,7 +11,7 @@ # Thomas HALLER , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: networkmanager\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2020-01-12 14:16+0100\n" diff --git a/po/es.po b/po/es.po index cce25b03f3..084337c018 100644 --- a/po/es.po +++ b/po/es.po @@ -21,7 +21,7 @@ # msgid "" msgstr "" -"Project-Id-Version: master\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-05-03 09:09+0200\n" diff --git a/po/et.po b/po/et.po index 2a7942df82..2fb1e2ebe2 100644 --- a/po/et.po +++ b/po/et.po @@ -12,7 +12,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:05-0400\n" diff --git a/po/eu.po b/po/eu.po index 594453f057..2cfc86d4be 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:06-0400\n" diff --git a/po/fi.po b/po/fi.po index 4639bbd304..94450d93b4 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,7 +11,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:18-0400\n" diff --git a/po/fr.po b/po/fr.po index 73c2fff52a..168e042d41 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,7 +13,7 @@ # ljanda , 2019. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-08-15 10:06+0000\n" diff --git a/po/gd.po b/po/gd.po index fdf7314812..daf3ea8700 100644 --- a/po/gd.po +++ b/po/gd.po @@ -5,7 +5,7 @@ # GunChleoc , 2016. msgid "" msgstr "" -"Project-Id-Version: network-manager\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2016-01-29 11:29+0100\n" diff --git a/po/gl.po b/po/gl.po index 88c96ef987..06eed43be8 100644 --- a/po/gl.po +++ b/po/gl.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:08-0400\n" diff --git a/po/gu.po b/po/gu.po index a5f01d2822..b3f4eff3f2 100644 --- a/po/gu.po +++ b/po/gu.po @@ -11,7 +11,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:23-0400\n" diff --git a/po/he.po b/po/he.po index 949c51ca2d..6ceba82f23 100644 --- a/po/he.po +++ b/po/he.po @@ -5,7 +5,7 @@ # Lubomir Rintel , 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2016-04-16 05:26-0400\n" diff --git a/po/hi.po b/po/hi.po index 3c54873120..2064ebae64 100644 --- a/po/hi.po +++ b/po/hi.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:25-0400\n" diff --git a/po/hr.po b/po/hr.po index e16267ce56..51d073456c 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:26-0400\n" diff --git a/po/hu.po b/po/hu.po index c76800e6ce..18745fa896 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:27-0400\n" diff --git a/po/id.po b/po/id.po index 59129a294d..723d552735 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: NetworkManager master\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-12-31 15:54+0700\n" diff --git a/po/it.po b/po/it.po index f993fd47b8..36bb6c34fa 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ # Milo Casagrande , 2011, 2012, 2013, 2014, 2019. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-03-21 14:53+0100\n" diff --git a/po/ja.po b/po/ja.po index 39c742daef..b51a4a8529 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ # ljanda , 2019. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-08-15 04:44+0000\n" diff --git a/po/ka.po b/po/ka.po index 880606d216..3650dfbbf3 100644 --- a/po/ka.po +++ b/po/ka.po @@ -5,7 +5,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:08-0400\n" diff --git a/po/kn.po b/po/kn.po index d7a43ad09f..73c57ba665 100644 --- a/po/kn.po +++ b/po/kn.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:36-0400\n" diff --git a/po/ku.po b/po/ku.po index d5e82305e1..aeae153691 100644 --- a/po/ku.po +++ b/po/ku.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: network-manager\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2007-01-02 21:47+0000\n" diff --git a/po/lt.po b/po/lt.po index e6d4a28ab3..b44cde82bc 100644 --- a/po/lt.po +++ b/po/lt.po @@ -10,7 +10,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:10-0400\n" diff --git a/po/lv.po b/po/lv.po index 54c1a23f65..123dd5d4d2 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:39-0400\n" diff --git a/po/mk.po b/po/mk.po index 657a70eff1..80ed524bbe 100644 --- a/po/mk.po +++ b/po/mk.po @@ -10,7 +10,7 @@ # Lubomir Rintel , 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2016-04-16 12:56-0400\n" diff --git a/po/ml.po b/po/ml.po index 177ea7cdb4..a13bea804e 100644 --- a/po/ml.po +++ b/po/ml.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:41-0400\n" diff --git a/po/mr.po b/po/mr.po index 99c7f25816..04ae809242 100644 --- a/po/mr.po +++ b/po/mr.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:43-0400\n" diff --git a/po/nb.po b/po/nb.po index 51340dd5ab..75029b28c4 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:43-0400\n" diff --git a/po/ne.po b/po/ne.po index ec284f9561..444d8f36f6 100644 --- a/po/ne.po +++ b/po/ne.po @@ -10,7 +10,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:26-0400\n" diff --git a/po/nl.po b/po/nl.po index b103bf60fc..e05200bd5d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,7 +14,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:44-0400\n" diff --git a/po/oc.po b/po/oc.po index 521a2ae300..f883581d91 100644 --- a/po/oc.po +++ b/po/oc.po @@ -5,7 +5,7 @@ # Cédric Valmary (Tot en òc) , 2015. msgid "" msgstr "" -"Project-Id-Version: oc\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2021-05-18 21:37+0200\n" diff --git a/po/or.po b/po/or.po index b42101b8f6..ef94056909 100644 --- a/po/or.po +++ b/po/or.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:45-0400\n" diff --git a/po/pa.po b/po/pa.po index bad0004e4b..ca3c2db997 100644 --- a/po/pa.po +++ b/po/pa.po @@ -10,7 +10,7 @@ # Thomas Haller , 2017. #zanata. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-04-19 10:17-0500\n" diff --git a/po/pt.po b/po/pt.po index 3c3479ccd5..b7fad912c6 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.18\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2020-10-11 21:09+0100\n" diff --git a/po/ro.po b/po/ro.po index 11b58d3ee1..940f5bc767 100644 --- a/po/ro.po +++ b/po/ro.po @@ -5,7 +5,7 @@ # Sergiu Bivol , 2022. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-03-14 12:13+0000\n" "PO-Revision-Date: 2022-03-14 13:23+0000\n" diff --git a/po/ru.po b/po/ru.po index b38f537f40..077725c505 100644 --- a/po/ru.po +++ b/po/ru.po @@ -18,7 +18,7 @@ # Дронова Ю , 2020, 2021. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2021-03-31 20:27+0300\n" diff --git a/po/rw.po b/po/rw.po index c518e88eb8..864957330a 100644 --- a/po/rw.po +++ b/po/rw.po @@ -13,7 +13,7 @@ # msgid "" msgstr "" -"Project-Id-Version: NetworkManager HEAD\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2005-03-31 20:55-0700\n" diff --git a/po/sk.po b/po/sk.po index 19179babdd..6966e157b8 100644 --- a/po/sk.po +++ b/po/sk.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-05-15 16:46+0200\n" diff --git a/po/sl.po b/po/sl.po index fccc508d9d..0e464d0cef 100644 --- a/po/sl.po +++ b/po/sl.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:11-0400\n" diff --git a/po/sq.po b/po/sq.po index 9bb4b970d3..36b6e81cf3 100644 --- a/po/sq.po +++ b/po/sq.po @@ -6,7 +6,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:11-0400\n" diff --git a/po/ta.po b/po/ta.po index f6a919f67e..4863c57f18 100644 --- a/po/ta.po +++ b/po/ta.po @@ -11,7 +11,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:21-0400\n" diff --git a/po/te.po b/po/te.po index 74653c3a60..29d386d238 100644 --- a/po/te.po +++ b/po/te.po @@ -8,7 +8,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:58-0400\n" diff --git a/po/th.po b/po/th.po index 724217776d..cdece37818 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 05:59-0400\n" diff --git a/po/tr.po b/po/tr.po index 8b4a767fe8..7f029a1e39 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9,7 +9,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:01-0400\n" diff --git a/po/uk.po b/po/uk.po index 5d45cfd254..6c308c6d87 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ # Thomas Haller , 2017. #zanata. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/NetworkMan" "ager/issues\n" "POT-Creation-Date: 2022-03-14 03:27+0000\n" diff --git a/po/vi.po b/po/vi.po index e1fdb660a7..354afe0bc9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -5,7 +5,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:11-0400\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index be6a002d5e..140b2008e7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17,7 +17,7 @@ # msgid "" msgstr "" -"Project-Id-Version: NetworkManager main\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/" "NetworkManager/issues\n" "POT-Creation-Date: 2021-11-07 03:29+0000\n" diff --git a/po/zh_HK.po b/po/zh_HK.po index 851d32eb30..08febf8be9 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ # Thomas Haller , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2017-04-21 06:26-0400\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 8b0a20d428..ac389a5767 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -17,7 +17,7 @@ # Hsiu-Ming Chang , 2019. msgid "" msgstr "" -"Project-Id-Version: NetworkManager master\n" +"Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-01 17:17+0200\n" "PO-Revision-Date: 2019-06-28 19:18+0800\n" From 20f43d968fc45316b5bc2db79508ffaf98275ed6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2022 19:55:33 +0100 Subject: [PATCH 8/8] po: unify "Language" header field in po files `msgfmt -vc` warns: po/be@latin.po:2: warning: header field 'Language' still has the initial default value Check all files and update the Language manually. The documentation ([1]) says that either "ll", "ll_CC" or "ll_CC@variant" is valid. Update accordingly. [1] https://www.gnu.org/software/gettext/manual/html_node/Header-Entry.html --- po/be@latin.po | 2 +- po/bn_IN.po | 2 +- po/en_CA.po | 2 +- po/en_GB.po | 2 +- po/oc.po | 2 +- po/sr@latin.po | 2 +- po/wa.po | 2 +- po/zh_HK.po | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/be@latin.po b/po/be@latin.po index c5b77f354a..5bdc12f7c3 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -6,7 +6,7 @@ msgstr "" "PO-Revision-Date: 2008-03-29 21:43+0200\n" "Last-Translator: Ihar Hrachyshka \n" "Language-Team: Belarusian Latin \n" -"Language: \n" +"Language: be_BY@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/bn_IN.po b/po/bn_IN.po index c48718dcc0..fc7a2a16ed 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -15,7 +15,7 @@ msgstr "" "PO-Revision-Date: 2017-04-21 05:09-0400\n" "Last-Translator: Copied by Zanata \n" "Language-Team: Bengali (India) \n" -"Language: bn-IN\n" +"Language: bn_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/en_CA.po b/po/en_CA.po index 5e8ae0f20f..6909b095f6 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2005-09-06 14:52-0400\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" -"Language: \n" +"Language: en_CA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/en_GB.po b/po/en_GB.po index 2483280b2d..60630665a8 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -15,7 +15,7 @@ msgstr "" "PO-Revision-Date: 2017-04-21 05:17-0400\n" "Last-Translator: Copied by Zanata \n" "Language-Team: Sugar Labs\n" -"Language: en-GB\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/oc.po b/po/oc.po index f883581d91..1c780c9d22 100644 --- a/po/oc.po +++ b/po/oc.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2021-05-18 21:37+0200\n" "Last-Translator: Quentin PAGÈS\n" "Language-Team: Tot en òc (totenoc.eu)\n" -"Language: oci\n" +"Language: oc\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sr@latin.po b/po/sr@latin.po index 6fe4fb7120..6fd9e9bd93 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2010-10-18 16:48+0200\n" "Last-Translator: Miloš Popović \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr_RS@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/wa.po b/po/wa.po index 0576412736..c34dcdd6a8 100644 --- a/po/wa.po +++ b/po/wa.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2004-09-09 10:41+0200\n" "Last-Translator: Pablo Saratxaga \n" "Language-Team: Walloon \n" -"Language: \n" +"Language: wa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/zh_HK.po b/po/zh_HK.po index 08febf8be9..2b8a8c4e14 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2017-04-21 06:26-0400\n" "Last-Translator: Copied by Zanata \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh-HK\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"