Help with error during msgfmt checking po file

2014-03-25 Thread Dmitry Pavlov
Hello, could you help me please to find out, what is wrong with the following line in ru.po: #. src/report/business-reports/taxinvoice.scm #: ../intl-scm/guile-strings.c:1772 #, c-format msgid "" "Width of the logo in CSS format, e.g. 10% or 32px. Leave blank to display " "the logo at its natural

Re: Branching strategy for git

2014-03-25 Thread Geert Janssens
On Saturday 22 March 2014 18:39:13 John Ralls wrote: > On Mar 22, 2014, at 4:01 PM, Geert Janssens wrote: > > > Is 'stable' going to be per-release-series, i.e., will we have > > > 'stable-2.6' and in two years 'stable-2.8'? Or do we have a single > > > 'stable' that gets 'master' merged into it a

Re: Branching strategy for git

2014-03-25 Thread John Ralls
On Mar 25, 2014, at 8:15 AM, Geert Janssens wrote: > > If no one beats me to it I'll try to adapt the git wiki page with this info > in the coming days. OK. The main change seems to me to be that instead of making a '2.6' branch next week I'll be making a 'maint' branch. Have you experimen

Re: Branching strategy for git

2014-03-25 Thread Dmitry Pavlov
Branch is just a pointer to head of revisions list (node in revision tree) . So if you merge private branch in branch that is then pushed to public, it will be visible like this: http://git-scm.com/figures/18333fig0317-tn.png But without pointer to iss53 On Mar 25, 2014, at 8:15 AM, Geert Janssens

gnucash wiki - overall table of contents

2014-03-25 Thread Alex Aycinena
Whenever I have followed a link, say from an e-mail or something, to a specific topic in the gnucash wiki it works fine to get to the specific topic. When I go to the overall top page, while there are links to many sub-topics, there doesn't seem to be an over-all table of contents for the wiki. So

Re: Branching strategy for git

2014-03-25 Thread Derek Atkins
John Ralls writes: > On Mar 25, 2014, at 8:15 AM, Geert Janssens wrote: > >> >> If no one beats me to it I'll try to adapt the git wiki page with >> this info in the coming days. > > OK. The main change seems to me to be that instead of making a '2.6' > branch next week I'll be making a 'maint

Re: gnucash wiki - overall table of contents

2014-03-25 Thread Geert Janssens
On Tuesday 25 March 2014 10:38:36 Alex Aycinena wrote: > Whenever I have followed a link, say from an e-mail or something, to a > specific topic in the gnucash wiki it works fine to get to the > specific topic. When I go to the overall top page, while there are > links to many sub-topics, there doe

Re: Branching strategy for git

2014-03-25 Thread Geert Janssens
On Tuesday 25 March 2014 13:46:17 Derek Atkins wrote: > John Ralls writes: > > On Mar 25, 2014, at 8:15 AM, Geert Janssens > > wrote: > >> If no one beats me to it I'll try to adapt the git wiki page with > >> this info in the coming days. > > > > OK. The main change seems to me to be that inst

Re: Branching strategy for git

2014-03-25 Thread John Ralls
On Mar 25, 2014, at 9:52 AM, Dmitry Pavlov wrote: > Branch is just a pointer to head of revisions list (node in revision tree) . > So if you merge private branch in branch that is then pushed to public, it > will be visible like this: > http://git-scm.com/figures/18333fig0317-tn.png > But with

Re: Branching strategy for git

2014-03-25 Thread John Ralls
On Mar 25, 2014, at 10:46 AM, Derek Atkins wrote: > John Ralls writes: > >> On Mar 25, 2014, at 8:15 AM, Geert Janssens >> wrote: >> >>> >>> If no one beats me to it I'll try to adapt the git wiki page with >>> this info in the coming days. >> >> OK. The main change seems to me to be that

Re: gnucash wiki - overall table of contents

2014-03-25 Thread Alex Aycinena
Geert, On Tue, Mar 25, 2014 at 10:50 AM, Geert Janssens wrote: > On Tuesday 25 March 2014 10:38:36 Alex Aycinena wrote: > > > Whenever I have followed a link, say from an e-mail or something, to a > > > specific topic in the gnucash wiki it works fine to get to the > > > specific topic. When I

Re: Branching strategy for git

2014-03-25 Thread Dmitry Pavlov
As I said, you'll just see a fork and merge but without identification of "private branch". I made a small local example and the result: * 124d38e (HEAD, origin/master, master) Merge branch 'private' |\ | * cbcff86 change in private * | ebe2dec another commit in master * | 4bfde8e change in maste

Re: Branching strategy for git

2014-03-25 Thread John Ralls
On Mar 25, 2014, at 11:35 AM, Dmitry Pavlov wrote: > As I said, you'll just see a fork and merge but without identification of > "private branch". I made a small local example and the result: > * 124d38e (HEAD, origin/master, master) Merge branch 'private' > |\ > | * cbcff86 change in priva