Re: synchronizing po file of branch and trunk

Scott Kostyshak wrote: > I thought I just needed to overwrite the trunk po files with the branch > po files, but it seems there are changes in the trunk po files that are > not in branch (e.g. a73c2647). So what is the procedure for this? This is somewhat chaotic territory, you can't be really

Re: [patch] RFC: better submenu for tables

Le 11/11/2015 01:53, Uwe Stöhr a écrit : I agree that submenus are better than to remove things. Attached is a patch. OK to go in? Thanks, we need something like that. A few comments: - Menu "context-tabular" - Item "Multicolumn|u" "inset-modify tabular multicolumn" -

Re: Tentative schedule for 2.2.0 release

On Wed, Nov 11, 2015 at 01:20:35PM +0100, Jean-Marc Lasgouttes wrote: > Le 11/11/2015 09:02, Scott Kostyshak a écrit : > >Below is a tentative schedule for releasing 2.2.0. I think the schedule > >is slightly on the aggressive side, and that is because I think the > >state of our master branch is

Re: synchronizing po file of branch and trunk

On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > Scott Kostyshak wrote: > > I thought I just needed to overwrite the trunk po files with the branch > > po files, but it seems there are changes in the trunk po files that are > > not in branch (e.g. a73c2647). So what is the procedure

Re: beamer workflow

Am Dienstag 10 November 2015, 10:21:02 schrieb Edwin Leuven: > dear all, > > when i insert a new frame, add the title and hit enter the new line is set > to “Frame” > similarly if i am editing the contents of my frame which is an indented > standard environment enter gives me a new line set to

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

Am Mittwoch, 11. November 2015 um 00:11:26, schrieb Günter Milde > commit 9894e0be23dafe3ad195d483ed7a0dd44cabf847 > Author: Günter Milde > Date: Wed Nov 11 00:10:06 2015 +0100 > > Fix 480937a103708a651/lyxgit. See also #9740. > > Actually, the changed

Re: We now include both png and svgz?

On Wed, Nov 11, 2015 at 1:02 PM, Jean-Marc Lasgouttes wrote: > Le 10/11/2015 10:02, Vincent van Ravesteijn a écrit : >> >> At the moment you cannot use LyX with Qt4 because it cannot read svgz >> files, and the code is not correctly falling back to png files. >> >> So yes, we

Re: [patch] RFC: better submenu for tables

Le 11/11/2015 12:57, Guillaume Munch a écrit : Le 11/11/2015 12:13, Jean-Marc Lasgouttes a écrit : Le 11/11/2015 01:53, Uwe Stöhr a écrit : I agree that submenus are better than to remove things. Attached is a patch. OK to go in? Thanks, we need something like that. A few comments (...)

Re: [patch] RFC: better submenu for tables

Le 11/11/2015 12:13, Jean-Marc Lasgouttes a écrit : Le 11/11/2015 01:53, Uwe Stöhr a écrit : I agree that submenus are better than to remove things. Attached is a patch. OK to go in? Thanks, we need something like that. A few comments: Sorry, our messages crossed each-other. I could not

Re: Tentative schedule for 2.2.0 release

Le 11/11/2015 09:02, Scott Kostyshak a écrit : Below is a tentative schedule for releasing 2.2.0. I think the schedule is slightly on the aggressive side, and that is because I think the state of our master branch is already relatively stable. alpha: tag and tar this week and announce this

Re: [patch] RFC: better submenu for tables

Le 11/11/2015 00:53, Uwe Stöhr a écrit : Am 04.11.2015 um 10:42 schrieb Jean-Marc Lasgouttes: This is not how contextual menus are supposed to work IMO. I would propose instead to use submenus and to micmick what libreoffice (for ex.) does. I agree that submenus are better than to remove

Re: We now include both png and svgz?

Le 10/11/2015 10:02, Vincent van Ravesteijn a écrit : At the moment you cannot use LyX with Qt4 because it cannot read svgz files, and the code is not correctly falling back to png files. So yes, we need both, otherwise we will have to require newer versions of Qt. My copy of lyx 2.2 with

Re: Tentative schedule for 2.2.0 release

Le 11/11/2015 08:02, Scott Kostyshak a écrit : Below is a tentative schedule for releasing 2.2.0. I think the schedule is slightly on the aggressive side, and that is because I think the state of our master branch is already relatively stable. alpha: tag and tar this week and announce this

Re: We now include both png and svgz?

Am Mittwoch, 11. November 2015 um 13:02:53, schrieb Jean-Marc Lasgouttes > Le 10/11/2015 10:02, Vincent van Ravesteijn a écrit : > > At the moment you cannot use LyX with Qt4 because it cannot read svgz > > files, and the code is not correctly falling back to png files. > > >

Re: [patch] RFC: better submenu for tables

Am 11.11.2015 um 13:57 schrieb Guillaume Munch: Many thanks for your review. I think that "Border" is clearer than "Line", and ok for just having Top/bottom... Done. Well multirow and multicolumn is about cells, so I moved it with cells. multirow can be for several cells but also for

Re: Tentative schedule for 2.2.0 release

On Thu, Nov 12, 2015 at 1:45 AM, Pavel Sanda wrote: > Liviu Andronic wrote: >> no major crashes. Unless we have major issues that need addressed and >> fixed prior to this major release, I think the general hope around is >> that we get an RC and even the actual release by the end

Re: [patch] RFC: better submenu for tables

Am 11.11.2015 um 13:52 schrieb Guillaume Munch: I tried your patch, but it does not apply with "git apply". Did you use "git diff" to produce the diff? Yes, I did use unified diff. git apply works fine here. Then I applied it by hand. I like it but here are some minor comments: * I would

Re: synchronizing po file of branch and trunk

On Wed, Nov 11, 2015 at 04:29:19PM -0800, Pavel Sanda wrote: > Scott Kostyshak wrote: > > Or is there another source of chaos? > > Unfortunately it is. It is called 'remerge of strings' when no new > translations are added > but po files are made up-to-date with the current source code. > So if

Re: Tentative schedule for 2.2.0 release

Liviu Andronic wrote: > no major crashes. Unless we have major issues that need addressed and > fixed prior to this major release, I think the general hope around is > that we get an RC and even the actual release by the end of the year, > or perhaps very early next year. I do not think that 1.5

Re: synchronizing po file of branch and trunk

Scott Kostyshak wrote: > Or is there another source of chaos? Unfortunately it is. It is called 'remerge of strings' when no new translations are added but po files are made up-to-date with the current source code. So if you have remerge in master all po files get touched although no new

Re: [patch] RFC: better submenu for tables

Am 11.11.2015 um 13:13 schrieb Jean-Marc Lasgouttes: Many Thanks for reviewing. Since the menu name is about lines, should we just have entry Top/Bottom... Done. What about putting multirow with rows and multicolumns with columns? That#s a matter of taste. For multirow/column one needs

Re: Tentative schedule for 2.2.0 release

On Thu, Nov 12, 2015 at 12:01:40AM +0100, Liviu Andronic wrote: > On Wed, Nov 11, 2015 at 7:10 PM, Scott Kostyshak wrote: > > On Wed, Nov 11, 2015 at 01:20:35PM +0100, Jean-Marc Lasgouttes wrote: > >> Le 11/11/2015 09:02, Scott Kostyshak a écrit : > >> >Below is a tentative

Re: Tentative schedule for 2.2.0 release

On Wed, Nov 11, 2015 at 12:03:19PM +, Guillaume Munch wrote: > Le 11/11/2015 08:02, Scott Kostyshak a écrit : > >Below is a tentative schedule for releasing 2.2.0. I think the schedule > >is slightly on the aggressive side, and that is because I think the > >state of our master branch is

Re: synchronizing po file of branch and trunk

Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > > Scott Kostyshak wrote: > > > I thought I just needed to overwrite the trunk po files with the branch > > > po files, but it seems there are

Re: Tentative schedule for 2.2.0 release

Le 11 novembre 2015 19:10:05 GMT+01:00, Scott Kostyshak a écrit : >What stage(s) would you propose making shorter? All of them ? :) Seriously, we'll see what happens. We should go as fast as possible but not more. JMarc

Re: synchronizing po file of branch and trunk

Am Mittwoch, 11. November 2015 um 13:59:39, schrieb Scott Kostyshak > On Wed, Nov 11, 2015 at 07:46:46PM +0100, Kornel Benko wrote: > > Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > > > > > On Wed, Nov 11, 2015 at 12:52:43AM -0800,

Re: synchronizing po file of branch and trunk

On Wed, Nov 11, 2015 at 07:46:46PM +0100, Kornel Benko wrote: > Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > > > On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > > > Scott Kostyshak wrote: > > > > I thought I just needed to overwrite the

Re: synchronizing po file of branch and trunk

On Wed, Nov 11, 2015 at 08:56:33PM +0100, Kornel Benko wrote: > Am Mittwoch, 11. November 2015 um 13:59:39, schrieb Scott Kostyshak > > > On Wed, Nov 11, 2015 at 07:46:46PM +0100, Kornel Benko wrote: > > > Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > >

[PATCH] Bug #9854 "Dataloss after git merge with change tracking"

Dear list, The patch below fixes bug #9854. () Find more details in the commit log. I have two questions: * I had to remove a const qualifier in Text::readParToken (see patch below). Do I need to put it back? If so, what's the proper way of adding the

Re: [LyX/master] Fix \origin lines

On Wed, Nov 11, 2015 at 10:27:37PM +0100, Georg Baum wrote: > These were fixed manually. I tried to add an option to updatedocs.py to > open and save a file with LyX, but that did not work, since > lyx -x 'command-sequence buffer-write ; lyx-quit' does not write and does > not

Re: synchronizing po file of branch and trunk

Le 11/11/15 22:39, Scott Kostyshak a écrit : Branch has less strings than master. (6609 vs. 6817). And not all strings from branch are common with master. I see. So there is no rule that I can use to do what I want then. I guess I will just copy over the po files from branch that have not

Re: We now include both png and svgz?

Le 11/11/15 13:37, Vincent van Ravesteijn a écrit : In any case, the logic is a bit strange. The icon names are defined with the extension {png,svgz} so that any one matched, and getPixmap checks whether the file can be loaded or not. However, iconName then already decides on whether it is png

Re: synchronizing po file of branch and trunk

On Wed, Nov 11, 2015 at 11:14:49PM +0100, Jean-Marc Lasgouttes wrote: > Le 11/11/15 22:39, Scott Kostyshak a écrit : > >>Branch has less strings than master. (6609 vs. 6817). And not all strings > >>from branch > >>are common with master. > > > >I see. So there is no rule that I can use to do

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

Am Mittwoch, 11. November 2015 um 22:49:19, schrieb Guenter Milde > On 2015-11-11, Kornel Benko wrote: > > Am Mittwoch, 11. November 2015 um 00:11:26, schrieb Günter Milde > >> commit 9894e0be23dafe3ad195d483ed7a0dd44cabf847 > >> Author: Günter Milde > >>

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

On Wed, Nov 11, 2015 at 10:12:42PM +, Guillaume Munch wrote: > Scott, this can wait until after alpha, as you want. Yes, I would prefer that. Thanks for your patience. Scott

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

On 2015-11-11, Kornel Benko wrote: > Am Mittwoch, 11. November 2015 um 00:11:26, schrieb Günter Milde >> commit 9894e0be23dafe3ad195d483ed7a0dd44cabf847 >> Author: Günter Milde >> Date: Wed Nov 11 00:10:06 2015 +0100 >> Fix 480937a103708a651/lyxgit. See also #9740. >>

Re: Tentative schedule for 2.2.0 release

On Wed, Nov 11, 2015 at 7:10 PM, Scott Kostyshak wrote: > On Wed, Nov 11, 2015 at 01:20:35PM +0100, Jean-Marc Lasgouttes wrote: >> Le 11/11/2015 09:02, Scott Kostyshak a écrit : >> >Below is a tentative schedule for releasing 2.2.0. I think the schedule >> >is slightly on the

Tentative schedule for 2.2.0 release

Below is a tentative schedule for releasing 2.2.0. I think the schedule is slightly on the aggressive side, and that is because I think the state of our master branch is already relatively stable. alpha: tag and tar this week and announce this weekend or Monday beta: beginning of January RC: end

synchronizing po file of branch and trunk

I thought I just needed to overwrite the trunk po files with the branch po files, but it seems there are changes in the trunk po files that are not in branch (e.g. a73c2647). So what is the procedure for this? Scott