diff options
author | Werner Koch <[email protected]> | 2024-05-16 07:46:36 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2024-05-16 07:46:36 +0000 |
commit | 287e717b55d2045b486a4986e39777d3871e6377 (patch) | |
tree | f528422007c3675acc31bab380b9d0c4a7d74b16 /po | |
parent | gpg: Terminate key listing on output write error. (diff) | |
parent | card: Fix compiler warning. (diff) | |
download | gnupg-287e717b55d2045b486a4986e39777d3871e6377.tar.gz gnupg-287e717b55d2045b486a4986e39777d3871e6377.zip |
Merge branch 'STABLE-BRANCH-2-4' into master
--
Fixed conflicts in:
NEWS
g10/call-agent.c
g10/options.h
kbx/kbxutil.c
tools/gpgconf.c
Diffstat (limited to 'po')
-rw-r--r-- | po/LINGUAS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/po/LINGUAS b/po/LINGUAS index cc9cf27ab..5e26a2c3b 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -16,6 +16,7 @@ id it ja nb +nl pl pt ro |