From patchwork Thu Apr 15 11:42:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valters Jansons X-Patchwork-Id: 4169 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FLcs92yVbz40R0 for ; Thu, 15 Apr 2021 11:42:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FLcs859SCz1Tr; Thu, 15 Apr 2021 11:42:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FLcs81YDTz2yF8; Thu, 15 Apr 2021 11:42:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FLcs729rYz2xcS for ; Thu, 15 Apr 2021 11:42:35 +0000 (UTC) Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FLcs60r7pzTD for ; Thu, 15 Apr 2021 11:42:34 +0000 (UTC) Received: by mail-lj1-x233.google.com with SMTP id l22so19368293ljc.9 for ; Thu, 15 Apr 2021 04:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7GW/skmSfmNOO/fn+nS2ZRH8DQbtRp5sA1JYUr7qqVU=; b=H1Y2ptw7UVXvN0WlXOvSEbR69s0xyCxKsL8OFYmfJmhMtwEB8YEvIBhCv2g+4Mjr81 ccyDvOuOYzqT1wY7WvYWy6Hhx8vCL3Ea1nHMmHoudy81sO8SfzRCsTX4zXifrYpdYgUK v8ENw8xOqEv6gfSEF24RDX3rV8UQAeL8/qVv2zmYmWNatf/6vlAClDjwYDGbK4G87AKm A7afeJX9uJFS8flMMerNgyxMp8bBRhoxEynjHD/D+5i7fwJTZzeYvUsGPpYmTvzOHfX2 g2YEb2ut7aL+h17BUukU1kZlQLImkLHbc2OVbvC7MA4YXbpU3lGD7FAnV1cYRkdg8GSb 2NBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7GW/skmSfmNOO/fn+nS2ZRH8DQbtRp5sA1JYUr7qqVU=; b=r+OoEo3FjjibEmPdwvuk24ZstzQdSEC8UqCbiOcNpkGagobQsAGvBSIZA7pGy44Tea oLCQyJfPNqOjb7Hwlu5VcxGMSpNPMZ6SxEacO7WVNSAEQuhqXj1x/DCxAj3HVfwnQdGg 9J0NhZ3d5Bsq5hueZzk6v8qbvsDWTsU7W0RtGtN0ZJTPn71lT7x792aZzzxUCox3UmAP PTB/Sdm70e0LM74hDWWsskvG7dMfz5kbY8EM8EpwgGsnE1Mb7Xu6wApJWJZY2jzvfbVy tpZnerBRd25xCzvBaXWYxXj7ZinaMXS7D8fhLCQsuw7iK4FLeGKC2tlLrFomg6GVYyL+ ataw== X-Gm-Message-State: AOAM53216YyKfOZw22RCcOqST8k/DB8q+XvXmF6kSyYChfato+cT4MP+ OqJ9Q8lmToNlVFvfbdiogCPjdhJ7wiWHxw== X-Google-Smtp-Source: ABdhPJxA7FttoL4aXv5WXJOfL8bytdAaR0QPMaEfV/GOv7f7ZH3QuX0WJ2sC/n8iR5N1xmAT+k02jw== X-Received: by 2002:a2e:8ed4:: with SMTP id e20mr1498441ljl.129.1618486952217; Thu, 15 Apr 2021 04:42:32 -0700 (PDT) Received: from DESKTOP-30GCCHK.localdomain ([212.3.198.239]) by smtp.gmail.com with ESMTPSA id n1sm639189lfu.282.2021.04.15.04.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 04:42:31 -0700 (PDT) From: Valters Jansons To: IPFire Location Mailing List Subject: [PATCH v3] po: Update translations Date: Thu, 15 Apr 2021 14:42:13 +0300 Message-Id: <20210415114213.1913-1-valter.jansons@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1618486954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=7GW/skmSfmNOO/fn+nS2ZRH8DQbtRp5sA1JYUr7qqVU=; b=wYYhZeZ3dSiwyQIp7Ef7u/DiCxN9Cq/k/ug0WJQfWObhCFW0bZ8jHS8T4N87uHVCODiFfv Nj/mt9JfmZadbblcXTU5edFLlhFthZSQIwHjeSrjWZc+ubNjulYrzHAQMbJTiL9vBHruEb 4vQiOr12ukzSykybq+Ri/VN7Dfeje5CfgcVxm9LjDU4daURQy6LupsNu7yYOjalvTSEIYK RajUHb/c0AhpXRMO57Ge+cp5HOd7bGSNaT05Mg3agGU7axrsuShPsjccVrjTiP4iJPhyXm 6Zdht185ErL4haUKyBez/A1hVZmmtNUpaxCsXJIlnjPEEcDrjoXVY7LzOEiXgw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=H1Y2ptw7; spf=pass (mail01.ipfire.org: domain of valterjansons@gmail.com designates 2a00:1450:4864:20::233 as permitted sender) smtp.mailfrom=valterjansons@gmail.com ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1618486954; a=rsa-sha256; cv=none; b=qI3djs6yxJt3o85ptvFBGByVZCQWyByq80ivZwK4x9h+Ne6tLU5A1kRrdNmKrv74iuP831 RmMegqss0ry+T8o/YdK62iqhmLdPdX9tJnk2c1tH2KGmlq3i76W8qY0/iM1PvzPPrXBFqh VBOeelYPWxFAsxTYPiH91v6R9hK5tseaa/PuacbjAAr9MHfldb4NUf8calpmOPQGbQl8DD HLtTsMEgbyKmk3MpgMaT0P2Jt8q0tIoDpIdcSuD8wo1Lp/yROZizGvlHIU8USd606AGwDf PWjfYdPeOLeLfnOUm02P5Jm40fkAHtP91meVhJlTnKVhSPQs/VpsI7jafoyc+Q== X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-1.75 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; IP_REPUTATION_HAM(-0.75)[asn: 15169(-0.21), country: US(-0.01), ip: 2a00:1450:4864:20::(-0.16)]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RECEIVED_SPAMHAUS_PBL(0.00)[212.3.198.239:received]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[99.99%]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[location@lists.ipfire.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::233:from]; NEURAL_HAM(-1.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4FLcs60r7pzTD Authentication-Results: mail01.ipfire.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=H1Y2ptw7; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mail01.ipfire.org: domain of valterjansons@gmail.com designates 2a00:1450:4864:20::233 as permitted sender) smtp.mailfrom=valterjansons@gmail.com X-BeenThere: location@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: location-bounces@lists.ipfire.org Sender: "Location" POTFILES.in should not contain src/python/__init__.py file as it is not present in the committed tree. It has its respective .in file which is present instead. This commit further ensures po/POTFILES.in generator avoids such files that Git ignores (using git-check-ignore during find). Signed-off-by: Valters Jansons --- Makefile.am | 5 +++-- debian/control | 1 + po/POTFILES.in | 3 +-- po/de.po | 5 ++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index e8ee791..dbdfd8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,8 +79,9 @@ update-po: po/POTFILES.in $(MAKE) -C po update-po po/POTFILES.in: Makefile - find $(abs_srcdir)/src | \ - grep -E "\.(in|py)$$" | sed -e "s@$(abs_srcdir)/@@g" | sort > $@ + find $(abs_srcdir)/src -type f \( -name '*.in' -o -name '*.py' \) \ + \! -exec git check-ignore -q {} \; -print | \ + sed -e "s@$(abs_srcdir)/@@g" | LC_ALL=C sort > $@ EXTRA_DIST += \ examples/private-key.pem \ diff --git a/debian/control b/debian/control index dc40927..118a111 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: systemd, xsltproc , docbook-xsl , + git, Rules-Requires-Root: no Homepage: https://location.ipfire.org/ Vcs-Git: https://git.ipfire.org/pub/git/location/libloc.git diff --git a/po/POTFILES.in b/po/POTFILES.in index 9088986..5d2cc46 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,11 +1,10 @@ src/libloc.pc.in +src/python/__init__.py.in src/python/database.py src/python/downloader.py src/python/export.py src/python/i18n.py src/python/importer.py -src/python/__init__.py -src/python/__init__.py.in src/python/location-importer.in src/python/location.in src/python/logger.py diff --git a/po/de.po b/po/de.po index c35f348..8656453 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libloc 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-04 15:44+0000\n" +"POT-Creation-Date: 2021-04-15 11:29+0000\n" "PO-Revision-Date: 2018-02-01 14:05+0000\n" "Last-Translator: Michael Tremer \n" "Language-Team: German\n" @@ -217,8 +217,7 @@ msgstr "" msgid "AS%(asn)s belongs to %(name)s" msgstr "" -#, python-format -msgid "The datase has recently be updated recently (%s)" +msgid "The database has been updated recently" msgstr "" msgid "You must at least pass one flag"