From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-i18n 5/7] make: do_update: use --update for msgmerge
Date: Mon, 20 Jul 2026 13:13:40 +0200 [thread overview]
Message-ID: <20260720111343.353644-7-m.sandoval@proxmox.com> (raw)
In-Reply-To: <20260720111343.353644-1-m.sandoval@proxmox.com>
Removes the need for temporal files.
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 98ecf4f7..4934b360 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ update_pot: submodule
do_update:
$(MAKE) update_pot
$(MAKE) messages.pot
- for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose $$i.po messages.pot >$$i.po.tmp && mv $$i.po.tmp $$i.po; done;
+ for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose --update $$i.po messages.pot; done;
update:
git submodule foreach 'git pull --ff-only origin master'
@@ -215,7 +215,7 @@ distclean: clean
.PHONY: clean
clean:
- rm -rf $(DEB_SOURCE)-[0-9]*/ *.po.tmp *.js.tmp *.deb *.dsc *.tar.* *.build *.buildinfo *.changes *.js messages.pot *.mo
+ rm -rf $(DEB_SOURCE)-[0-9]*/ *.js.tmp *.deb *.dsc *.tar.* *.build *.buildinfo *.changes *.js messages.pot *.mo
.PHONY: upload-pve upload-pmg upload-pbs upload-pdm upload
upload-%: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
--
2.47.3
next prev parent reply other threads:[~2026-07-20 11:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-20 11:13 [PATCH proxmox-i18n 0/7] Makefile simplifications and improvements Maximiliano Sandoval
2026-07-20 11:13 ` [PATCH proxmox-i18n 1/7] make: catalog-%.mo: explicitly set template file Maximiliano Sandoval
2026-07-20 11:13 ` [PATCH proxmox-i18n 2/7] make: simplify msgmerge commands Maximiliano Sandoval
2026-07-20 11:13 ` [PATCH proxmox-i18n 3/7] make: clean: Cleanup *.mo files Maximiliano Sandoval
2026-07-20 11:13 ` [PATCH proxmox-i18n 3/7] make: clean: remove " Maximiliano Sandoval
2026-07-20 11:13 ` [PATCH proxmox-i18n 4/7] make: do_update: use long options for msgmerge Maximiliano Sandoval
2026-07-20 11:13 ` Maximiliano Sandoval [this message]
2026-07-20 11:13 ` [PATCH proxmox-i18n 6/7] make: add --previous flag to msgmerge Maximiliano Sandoval
2026-07-20 11:13 ` [PATCH proxmox-i18n 7/7] gitignore: remove proxmox-datacenter-manager.pot Maximiliano Sandoval
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260720111343.353644-7-m.sandoval@proxmox.com \
--to=m.sandoval@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox