Hi, this affects only those of you who have uncommitted translation changes in their local copy of the darktable repository. Since I updated all po files some days ago to propagate some fixes (typos and xgettext declarations) to the language files, all your local changes might get overwritten (or at least result in a merge conflict) when pulling the latest revision.
So, if you have uncommitted translation changes (check: $ git status) please do: $ cd po/ $ mv YOUR_LANG.po YOUR_LANG.po.mine $ git pull $ mv YOUR_LANG.po.mine YOUR_LANG.po after this please update your language file (as usual: $ intltool-update YOUR_LANG) and commit your changes. Thanks and sorry for the quirk... /Simon ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ darktable-devel mailing list darktable-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/darktable-devel
