X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com Date: Mon, 17 Dec 2018 12:55:39 +0100 (CET) From: Roland Lutz To: "Sergey Alyoshin (alyoshin DOT s AT gmail DOT com) [via geda-user AT delorie DOT com]" Subject: Re: [geda-user] gerbv about to release In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Reply-To: geda-user AT delorie DOT com Errors-To: nobody AT delorie DOT com X-Mailing-List: geda-user AT delorie DOT com X-Unsubscribes-To: listserv AT delorie DOT com Precedence: bulk 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.