Re: Minor last minute edits in fr.po

2016-05-24 Thread Jean-Pierre Chrétien
Le 24/05/2016 16:03, Richard Heck a écrit : On 05/24/2016 04:02 AM, Jean-Pierre Chrétien wrote: Richard, one shortcut conflict resolution should be backported to 2.1.5. Okay to push ? Yes, that's fine. Done -- Jean-Pierre

Re: Minor last minute edits in fr.po

2016-05-24 Thread Richard Heck
On 05/24/2016 04:02 AM, Jean-Pierre Chrétien wrote: > Le 23/05/2016 23:22, Jean-Pierre Chrétien a écrit : >> Hello, >> >> Jean-Marc pointed out to me a mistake and a shortcut conflict, I have >> 2 commits >> ready fot these. Should this wait for 2.2.1 or may I push to master ? >> > > Richard, one s

Re: Minor last minute edits in fr.po

2016-05-24 Thread Jean-Pierre Chrétien
Le 23/05/2016 23:22, Jean-Pierre Chrétien a écrit : Hello, Jean-Marc pointed out to me a mistake and a shortcut conflict, I have 2 commits ready fot these. Should this wait for 2.2.1 or may I push to master ? Richard, one shortcut conflict resolution should be backported to 2.1.5. Okay to pus

Re: Minor last minute edits in fr.po

2016-05-23 Thread Scott Kostyshak
On Mon, May 23, 2016 at 11:59:04PM +0100, Jean-Pierre Chrétien wrote: > Le 23/05/2016 22:54, Scott Kostyshak a écrit : > > On Mon, May 23, 2016 at 11:22:02PM +0100, Jean-Pierre Chrétien wrote: > > > Hello, > > > > > > Jean-Marc pointed out to me a mistake and a shortcut conflict, I have 2 > > > co

Re: Minor last minute edits in fr.po

2016-05-23 Thread Jean-Pierre Chrétien
Le 23/05/2016 22:54, Scott Kostyshak a écrit : On Mon, May 23, 2016 at 11:22:02PM +0100, Jean-Pierre Chrétien wrote: Hello, Jean-Marc pointed out to me a mistake and a shortcut conflict, I have 2 commits ready fot these. Should this wait for 2.2.1 or may I push to master ? Go ahead. Thanks fo

Re: Minor last minute edits in fr.po

2016-05-23 Thread Scott Kostyshak
On Mon, May 23, 2016 at 11:22:02PM +0100, Jean-Pierre Chrétien wrote: > Hello, > > Jean-Marc pointed out to me a mistake and a shortcut conflict, I have 2 > commits ready fot these. Should this wait for 2.2.1 or may I push to master > ? Go ahead. Thanks for the fixes. Scott > > -- > Jean-Pier