X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=cmqECquZveorfXX6lEJLr1dR/Twy6X3yvpItWNaOi8c=; b=uN7EiqLDH7DlMTWKldFDHC21vjt9G4C7o/ql/MWh0QqQX/vXauaiKc9qFIdeqA7QHd oO9EwzpGSe9V6AqQc2ZRrgD6ANop57BMwrGf+tK4nbXMO1hWyKTCkQdMeC+4J30vvF6R p6D4bXg3yLZm9AJcbYwMLPk29lm10gnlHerwReZWaIutiTGTcGR1k830z8KBAFXcr8Ve 30aHiSiBQxBmJSny9tGSyfn2Kyv6vWiSu/rGkZtz8k9cPUvRvn2aXblviQ6Kf1Nka9Gh 7lzKssqB/2MHr6L45E9I/1f6C3r+Z1juaS2idjvePXyG8fnKK67AKGB1ukrO9qp0HFAP Kijg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=cmqECquZveorfXX6lEJLr1dR/Twy6X3yvpItWNaOi8c=; b=pCITVyKyI5CaOKGrsmVZar+64aFzhe22QGjIMDF9qhLU3+wunm/XKuSgIhkxbRLPfd LUJGgjm8F9IfHystObrAlRweD8/ROSPGbLIAtTEGLBTwME7gFYfmCzKzgz0QYIYNXdsk 4W2RvHCrIZR4+u+xxJVCLAIOXyVhJszfpDgHcFhQVAcUl72CJ4QwQ7Wysjcm3cHkv4kC EI0Edxj6DD27agmY4CvBZPXZBRPTSz7v6mN7PYlkjcF/kxhoOOgatZTdOBwQW0QnIIlG BpCb4LPTcLL6B/SFXUJ16UpwWB4ZOpwS7u+NF4mqhTh2nG2JvUserHtaszlu9UtarXh0 RlYQ== X-Gm-Message-State: AA+aEWZpPC5OBsFCceRpNpOzId5OFlS1zRezfM1O6G5O6DqnBhsUPVuJ SFC7rGBHET0dfvQyTiOdUQ4Gx/GrRY2NfRORiCWEOFkG X-Google-Smtp-Source: AFSGD/X9PxEGRyHNhtSeHmMFd2pptPJz/1miMlIgkWviLo/RuQ2VJnyNz7MLrjLdctffvrmAtlQvsAXFMksw0Z/KOC0= X-Received: by 2002:a9d:72e:: with SMTP id 43mr9650501ote.207.1545050021200; Mon, 17 Dec 2018 04:33:41 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: "Sergey Alyoshin (alyoshin DOT s AT gmail DOT com) [via geda-user AT delorie DOT com]" Date: Mon, 17 Dec 2018 15:33:29 +0300 Message-ID: Subject: Re: [geda-user] gerbv about to release To: geda-user AT delorie DOT com Content-Type: text/plain; charset="UTF-8" Reply-To: geda-user AT delorie DOT com On Mon, Dec 17, 2018 at 3:03 PM Roland Lutz wrote: > > On Mon, 17 Dec 2018, Sergey Alyoshin (alyoshin DOT s AT gmail DOT com) [via geda-user AT delorie DOT com] wrote: > > Yes ru.po (and man translation) are "auto" updated. This need to be fixed. > > > > You can reset not committed changes in files by > > git checkout . > > ## or only in po/ru.po > > git checkout po/ru.po > > > > After this I belie you can do 'git pull'. > > This works as intended, please don't "fix" it. > > Doing changes to the codebase affects the localized messages (even if the > strings don't change, the line numbers can still change). These changes > are automatically propagated to the .po files by the build system. > > How this is reflected in version control is a matter of convention. You > could commit the updated .po files along with the code changes in every > commit; or you could update the .po files only when you actually update > the translation. As a compromise, the .po files are often updated before > a release, whether or not the translation has actually been updated. > > If I didn't do any work in the po/ subdirectory, I usually just do "git > checkout po", or in case of geda-gaf, "git checkout */po" to reset the > changes. I want only manually run 'make update-po' and this require adding to po/Makevars [1]: PO_DEPENDS_ON_POT = no [1] https://www.gnu.org/software/gettext/manual/html_node/Translations-under-Version-Control.html