Re: Copying translations from 2.2.x to master?

[Jean-Pierre Chrétien]

Le 05/07/2017 à 10:14, Jean-Pierre Chrétien a écrit :


If I follow your usual way, I should now copy these changes in the French,
German, Japanese and Spanish docs.


As the subject says, I guess I should first load the foreign 2.2.x doc files in 
2.3.0dev and push them in master as 2.3 doc files, editing the author line to 
reflect the upgrade.
In that line, I guess also that a merge of the English docs between 2.2.x and 
2.3.0 is needed. Or, reversely, should all the new features in 2.3 docs be 
copied to 2.2.x versions, including the English one?


--
Jean-Pierre

Re: Copying translations from 2.2.x to master?

[Jean-Pierre Chrétien]

Le 05/07/2017 à 07:46, Scott Kostyshak a écrit :

On Wed, Jul 05, 2017 at 01:50:19AM +0200, Uwe Stöhr wrote:

The translations can be done. I stored all changes I made at the usual 
changelog files in the docs folder‎.


Thanks, Uwe! I sent the email for translations and asked them to finish
within two weeks.


Scott, the only changes in EmbeddedObjects are due to minted, should translators 
wait for this feature to be approved for 2.3?


--
Jean-Pierre

Re: Copying translations from 2.2.x to master?

[Jean-Pierre Chrétien]

Le 05/07/2017 à 09:08, Uwe Stöhr a écrit :

Hi Scott,

I try to find time for Lyx on Thursday evening. I totally lost contact to LyX, 
sorry.


Uwe, if you are overbooked, I said I could take care until you find time to come 
back to LyX.


Currently I've made a recollection of what is changed in the English 
documentation, see


http://www.lyx.org/trac/browser/lyxgit/lib/doc/docUpadatesFor23.txt

Only four doc files are changed (I did not check however the example files used 
as specific manuals): UserGuide, Additional, Customization and EmbeddedObjects.


If I follow your usual way, I should now copy these changes in the French, 
German, Japanese and Spanish docs. This will take a little time, so the 15 days 
allowed by Scott seem a bit short, as in addition you can see that the new 
documentation of biblatex gives a lot of new stuff to translate.
What about leaving the editions in change tracking mode in the English 
documentation and asking translators to perform themselves the copy in their doc 
files and then do the translations?


Please let me now what you intend to do on Thursday, so we can share the work if 
you agree to do so..


--
Jean-Pierre

Re: Copying translations from 2.2.x to master?

[Uwe Stöhr]

Hi Scott,

I try to find time for Lyx on Thursday evening. I totally lost contact to LyX, 
sorry.

Regards Uwe

  Original Message  
From: Scott Kostyshak
Sent: Mittwoch, 5. Juli 2017 07:46
To: Uwe Stöhr
Cc: lyx-devel@lists.lyx.org; Jean-Pierre Chrétien
Subject: Re: Copying translations from 2.2.x to master?

On Wed, Jul 05, 2017 at 01:50:19AM +0200, Uwe Stöhr wrote:
> The translations can be done. I stored all changes I made at the usual 
> changelog files in the docs folder‎.

Thanks, Uwe! I sent the email for translations and asked them to finish
within two weeks.

Scott

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Wed, Jul 05, 2017 at 01:50:19AM +0200, Uwe Stöhr wrote:
> The translations can be done. I stored all changes I made at the usual 
> changelog files in the docs folder‎.

Thanks, Uwe! I sent the email for translations and asked them to finish
within two weeks.

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

[Uwe Stöhr]

The translations can be done. I stored all changes I made at the usual 
changelog files in the docs folder‎.

  Original Message  
From: Scott Kostyshak
Sent: Mittwoch, 5. Juli 2017 00:04
To: lyx-devel@lists.lyx.org; Uwe Stöhr
Cc: Jean-Pierre Chrétien
Subject: Re: Copying translations from 2.2.x to master?

On Fri, Jun 30, 2017 at 11:15:29PM -0400, Scott Kostyshak wrote:

> Uwe, I am going to send an email to the translators. My big question to
> you (or anyone else) is: am I supposed to wait for the docs to be
> prepared before sending the email so that the translators can work on
> translating the docs at the same time as the strings? Or since our
> strings are ready can I send the email now? I would like to send the
> email as soon as possible so that we can start the clock on getting
> beta1 out.

Jean-Pierre, I think Uwe may be too busy to respond to the above for a
while. Do you know the answer? In the past, have translators been
notified after strings are ready but before the documentation is ready?
Or did we instead wait for the documentation is ready?

Thanks,

Scott

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Fri, Jun 30, 2017 at 11:15:29PM -0400, Scott Kostyshak wrote:

> Uwe, I am going to send an email to the translators. My big question to
> you (or anyone else) is: am I supposed to wait for the docs to be
> prepared before sending the email so that the translators can work on
> translating the docs at the same time as the strings? Or since our
> strings are ready can I send the email now? I would like to send the
> email as soon as possible so that we can start the clock on getting
> beta1 out.

Jean-Pierre, I think Uwe may be too busy to respond to the above for a
while. Do you know the answer? In the past, have translators been
notified after strings are ready but before the documentation is ready?
Or did we instead wait for the documentation is ready?

Thanks,

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Fri, Jun 30, 2017 at 11:18:14AM +0200, Jean-Pierre Chrétien wrote:

> As sole French translator of the UI since 2007 and of the docs since 2012, I
> think I can take care of the update of the 2.3 docs until the release and
> the come back of Uwe.

Thanks for volunteering, Jean-Pierre! This is very helpful.

> Here is what I understand to be done:
>  * for the English documentation
> - check if the recent 2.2.x changes have been ported to master (from the
> master Changelog files, I understand that this has been done for
> Customization, EmbeddedObjects, Math and UserGuide);
> - check what is new in the 2.3 docs by parsing the change tracking
> markers, and report it in a changelog file;
>  * for the French, German, Spanish and Japanese doc file, copy the changed
> parts of the English documentation and edit the Changelog files accordingly.

> Uwe, did I miss something ?

For questions to Uwe, he prefers that you always CC him directly (not at
his lyx.org address but his private one; see the CC in this email). Uwe,
please see the above questions.

Uwe, I am going to send an email to the translators. My big question to
you (or anyone else) is: am I supposed to wait for the docs to be
prepared before sending the email so that the translators can work on
translating the docs at the same time as the strings? Or since our
strings are ready can I send the email now? I would like to send the
email as soon as possible so that we can start the clock on getting
beta1 out.

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Fri, Jun 30, 2017 at 01:24:52AM +0200, Uwe Stöhr wrote:
> El 25.06.2017 a las 22:52, Scott Kostyshak escribió:
> 
> > I just wanted to make sure you saw my above questions.
> 
> Hi Scott,
> 
> I was too busy to follow LyX. I won't have time to take care for the docs
> for LyX 2.3. So I hereby resign as docs maintainer for LyX 2.3. When I find
> time I will work on the docs.

No problem, Uwe. Thanks for all of the work you've done on the docs in
the past. I know it's a time-consuming and difficult job.

> Please tell me when you release a new beta and I will try to build an
> installer.

OK I will do so.

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

[Jean-Pierre Chrétien]

Le 30/06/2017 à 01:24, Uwe Stöhr a écrit :

El 25.06.2017 a las 22:52, Scott Kostyshak escribió:


I just wanted to make sure you saw my above questions.


Hi Scott,

I was too busy to follow LyX. I won't have time to take care for the docs for
LyX 2.3. So I hereby resign as docs maintainer for LyX 2.3. When I find time I
will work on the docs.


As sole French translator of the UI since 2007 and of the docs since 2012, I 
think I can take care of the update of the 2.3 docs until the release and the 
come back of Uwe.


Here is what I understand to be done:
 * for the English documentation
- check if the recent 2.2.x changes have been ported to master (from the 
master Changelog files, I understand that this has been done for Customization, 
EmbeddedObjects, Math and UserGuide);
- check what is new in the 2.3 docs by parsing the change tracking markers, 
and report it in a changelog file;
 * for the French, German, Spanish and Japanese doc file, copy the changed 
parts of the English documentation and edit the Changelog files accordingly.


Uwe, did I miss something ?

--
Jean-Pierre

Re: Copying translations from 2.2.x to master?

[Uwe Stöhr]

El 25.06.2017 a las 22:52, Scott Kostyshak escribió:


I just wanted to make sure you saw my above questions.


Hi Scott,

I was too busy to follow LyX. I won't have time to take care for the 
docs for LyX 2.3. So I hereby resign as docs maintainer for LyX 2.3. 
When I find time I will work on the docs.


Please tell me when you release a new beta and I will try to build an 
installer.


regards Uwe

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Sat, Jun 10, 2017 at 01:27:02PM -0400, Scott Kostyshak wrote:
> On Sat, Jun 10, 2017 at 10:29:04AM +0200, Uwe Stöhr wrote:
> > Hi Scott, I am still away for another week. I already transferred the po 
> > files from 2.2.x to master for all active translations .
> 
> Great, thank you!
> 
> > So please don't touch the po files in master.
> 
> OK.
> 
> > The translators will be informed
> 
> By whom? I was going to send an email, but do you prefer to do it? That
> would probably be best since you know more about this than I do. Either
> way is fine with me. I just want to know who has the responsibility.
> Is 2 weeks a good time to give them for a deadline?
> 
> > that they only need to translate the giles in master for LyX 2.3. 
> 
> And what about the docs? Will you send an email about that also?
> 
> Scott

Hi Uwe,

I just wanted to make sure you saw my above questions. If no email has
been sent, I would like to do so as soon as possible. I believe that we
will resolve other beta-blockers soon (notably the discussion on
-shell-escape, and the discussion on dashes) so translations are the
last remaining issue before we can get a beta out.

I'm sorry to bother you when you are busy. Thank you for all of the work
you do for the translations.

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

[Georg Baum]

Kornel Benko wrote:

> So what is Uwe doing when he is re-merging? Probably calling
> development/tools/mergepo.py.

No. The workhose for remerging translations from the source code is 
po/lyx_pot.py. mergepo.py is only for merging between two branches without 
ptoducing huge nonsense diffs.

> I am not sure (because I am not expert) what
> happens on Windows. See mergepo_minimaldiff() there:
> 
> // What happens here with line endings?
> po2 = polib.pofile(source)
> 
> // This one looks good, but shouldn't we better explicitly open for
> text-mode? po1 = io.open(target, 'r', encoding='utf_8', newline=None)
> oldlines = read(po1)

lyx_pot.py opens some files explicitly with unix line ends, but not all:

output = io.open(output, 'w', encoding='utf_8', newline='\n')

I forgot all the details, but one reason for broken line ends that I do now 
remember again is this: Uwe is on windows, and receives an updated .po file 
from a translator who uses linux. Thus, the line ends are 'wrong' for his 
windows machine. I think this does not matter if he submits this as-is (git 
can cope with that), but if he remerges strings before submitting, then this 
might result in mixed line ends.

Maybe lyx_pot.py can be made more intelligent here? I am still strongly 
convinced that it is worth it to invest some time into a translations update 
machinery that is robust and does never require manual cleanup after a huge 
nonsense diff has been produced pays off in the long term.


Georg

Re: Copying translations from 2.2.x to master?

[Kornel Benko]

Am Sonntag, 11. Juni 2017 um 08:55:11, schrieb Georg Baum 

> Kornel Benko wrote:
> 
> > Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum
> >> 
> >> I would suggest to use git correctly instead of fixing broken line ends
> >> again and again, producing huge nonsense diffs. We had this discussion
> >> several times in the past.
> >>
> > 
> > Maybe a problem in merging and pushing from windows.
> > Scenario to merge:
> > #: src/frontends/qt4/ui/BiblioUi.ui:244
> > with
> > #: src/frontends/qt4/ui/ColorUi.ui:73
> > results in
> > #: src/frontends/qt4/ui/BiblioUi.ui:244
> > src/frontends/qt4/ui/ColorUi.ui:73 and after push the last
> >  is converted to 
> 
> Probably. However, this does not happen with a correctly configured git: On 
> windows, both .ui and .po use windows line ends, on unix both .po and .ui 
> use unix line ends, so merging works fine in both cases. The merge script 
> works with windoes line ends IIRC, as long as all files use them.
> 

So what is Uwe doing when he is re-merging? Probably calling 
development/tools/mergepo.py.
I am not sure (because I am not expert) what happens on Windows.
See mergepo_minimaldiff() there:

// What happens here with line endings?
po2 = polib.pofile(source)

// This one looks good, but shouldn't we better explicitly open for 
text-mode?
po1 = io.open(target, 'r', encoding='utf_8', newline=None)
oldlines = read(po1)
...

Kornel


signature.asc
Description: This is a digitally signed message part.

Re: Copying translations from 2.2.x to master?

[Georg Baum]

Kornel Benko wrote:

> Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum
>> 
>> I would suggest to use git correctly instead of fixing broken line ends
>> again and again, producing huge nonsense diffs. We had this discussion
>> several times in the past.
>>
> 
> Maybe a problem in merging and pushing from windows.
> Scenario to merge:
> #: src/frontends/qt4/ui/BiblioUi.ui:244
> with
> #: src/frontends/qt4/ui/ColorUi.ui:73
> results in
> #: src/frontends/qt4/ui/BiblioUi.ui:244
> src/frontends/qt4/ui/ColorUi.ui:73 and after push the last
>  is converted to 

Probably. However, this does not happen with a correctly configured git: On 
windows, both .ui and .po use windows line ends, on unix both .po and .ui 
use unix line ends, so merging works fine in both cases. The merge script 
works with windoes line ends IIRC, as long as all files use them.


Georg

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Sat, Jun 10, 2017 at 10:34:51AM +0200, Georg Baum wrote:
> Scott Kostyshak wrote:
> 
> > On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> > 
> >> Unless someone has a different idea, I will replace the Windows
> >> linebreaks with non-Windows linebreaks, update the strings on master,
> >> and try the mergepo.py call above again.
> > 
> > After Kornel's fixes to the Windows linebreaks, I tried mergepo.py again
> > but it did not update any translations.
> > 
> > Any other ideas?
> 
> Which translation updates do you expect? It seems that they are pretty much 
> in sync.

I just expected that there was something that I or someone else had to
do. I didn't know it had already been done.

> I get the attached diff when running
> 
> python -tt development/tools/mergepo.py ../lyx-2.2-git/po
> 
> from within the master branch.
> 
> 
> 
> Georg
> 
> PS: Sorry for being so unresponsive, still busy.

No problem, thanks for the response and good luck with the busyness.

Scott

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Sat, Jun 10, 2017 at 10:29:04AM +0200, Uwe Stöhr wrote:
> Hi Scott, I am still away for another week. I already transferred the po 
> files from 2.2.x to master for all active translations .

Great, thank you!

> So please don't touch the po files in master.

OK.

> The translators will be informed

By whom? I was going to send an email, but do you prefer to do it? That
would probably be best since you know more about this than I do. Either
way is fine with me. I just want to know who has the responsibility.
Is 2 weeks a good time to give them for a deadline?

> that they only need to translate the giles in master for LyX 2.3. 

And what about the docs? Will you send an email about that also?

Scott

Re: Copying translations from 2.2.x to master?

[Kornel Benko]

Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum 

> Kornel Benko wrote:
> 
> > Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak
> > 
> >> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote:
> >> 
> >> > > Unless someone has a different idea, I will replace the Windows
> >> > > linebreaks with non-Windows linebreaks, update the strings on master,
> >> > > and try the mergepo.py call above again.
> 
> If there are windows line breaks again someone uses a misconfigured git 
> client or does stuff behind the back of git. The settings in the 
> .gitattributes file ensure that .po files are always stored using unix line 
> ends in git, and using native OS line ends in working directories.

It was not line endings in the file but extra  inside a line
Example:
#: src/frontends/qt4/ui/BiblioUi.ui:244 
src/frontends/qt4/ui/ColorUi.ui:73
The line end was  as expected (not a windows )

> >> > I made a perl-script for this purpose (created and used for commit
> >> > 52eee8e). Should I add it to repo?
> >> 
> >> For the purpose of fixing the linebreaks
> > 
> > This one.
> 
> I would suggest to use git correctly instead of fixing broken line ends 
> again and again, producing huge nonsense diffs. We had this discussion 
> several times in the past.
>

Maybe a problem in merging and pushing from windows.
Scenario to merge:
#: src/frontends/qt4/ui/BiblioUi.ui:244
with
#: src/frontends/qt4/ui/ColorUi.ui:73
results in
#: src/frontends/qt4/ui/BiblioUi.ui:244 
src/frontends/qt4/ui/ColorUi.ui:73
and after push the last  is converted to 

> Georg
> 

Kornel

signature.asc
Description: This is a digitally signed message part.

Re: Copying translations from 2.2.x to master?

[Georg Baum]

Kornel Benko wrote:

> Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak
> 
>> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote:
>> 
>> > > Unless someone has a different idea, I will replace the Windows
>> > > linebreaks with non-Windows linebreaks, update the strings on master,
>> > > and try the mergepo.py call above again.

If there are windows line breaks again someone uses a misconfigured git 
client or does stuff behind the back of git. The settings in the 
.gitattributes file ensure that .po files are always stored using unix line 
ends in git, and using native OS line ends in working directories.

>> > I made a perl-script for this purpose (created and used for commit
>> > 52eee8e). Should I add it to repo?
>> 
>> For the purpose of fixing the linebreaks
> 
> This one.

I would suggest to use git correctly instead of fixing broken line ends 
again and again, producing huge nonsense diffs. We had this discussion 
several times in the past.


Georg

Re: Copying translations from 2.2.x to master?

[Georg Baum]

Scott Kostyshak wrote:

> On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> 
>> Unless someone has a different idea, I will replace the Windows
>> linebreaks with non-Windows linebreaks, update the strings on master,
>> and try the mergepo.py call above again.
> 
> After Kornel's fixes to the Windows linebreaks, I tried mergepo.py again
> but it did not update any translations.
> 
> Any other ideas?

Which translation updates do you expect? It seems that they are pretty much 
in sync. I get the attached diff when running

python -tt development/tools/mergepo.py ../lyx-2.2-git/po

from within the master branch.



Georg

PS: Sorry for being so unresponsive, still busy.
diff --git a/po/ar.po b/po/ar.po
index 0830149..35c26b1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1085,9 +1085,8 @@ msgid "Selected :"
 msgstr "الاستشهادات المحد&دة:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "ته&يئة"
+msgstr "تهيئة"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/ca.po b/po/ca.po
index 8e0d184..97611a8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1126,7 +1126,6 @@ msgid "Selected :"
 msgstr "Citacions :"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "S'està donant format"
 
diff --git a/po/cs.po b/po/cs.po
index 87ace39..e038f6d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1098,7 +1098,6 @@ msgid "Selected :"
 msgstr "é citace:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formátování"
 
diff --git a/po/da.po b/po/da.po
index d2c32af..57fb17f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1105,7 +1105,6 @@ msgid "Selected :"
 msgstr " referencer:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatering"
 
diff --git a/po/el.po b/po/el.po
index 56d5b8d..f20d50e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1105,7 +1105,6 @@ msgid "Selected :"
 msgstr "&Επιλεγμένες Παραπομπές:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Μορφοποίηση"
 
diff --git a/po/es.po b/po/es.po
index 0a9179a..293b9b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1093,9 +1093,8 @@ msgid "Selected :"
 msgstr "Citas :"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For"
+msgstr "Formato"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/eu.po b/po/eu.po
index 4d127bb..c294207 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1108,7 +1108,6 @@ msgid "Selected :"
 msgstr " aipamenak:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatua ematea"
 
diff --git a/po/gl.po b/po/gl.po
index 5b6d619..f2649fe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1125,7 +1125,6 @@ msgid "Selected :"
 msgstr "Citas seleccio:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formato"
 
diff --git a/po/he.po b/po/he.po
index d1bf07e..b0ada0f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1106,7 +1106,6 @@ msgid "Selected :"
 msgstr "מובאות נבחרות:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "עיצוב"
 
diff --git a/po/hu.po b/po/hu.po
index d361e52..6bc8f9d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1099,7 +1099,6 @@ msgid "Selected :"
 msgstr "Kiválasztott ások:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formátum"
 
diff --git a/po/ia.po b/po/ia.po
index 9de3029..30a2bda 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1090,9 +1090,8 @@ msgid "Selected :"
 msgstr "Citationes :"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For"
+msgstr "Formattation"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/id.po b/po/id.po
index cb03aa2..045746a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1102,7 +1102,6 @@ msgid "Selected :"
 msgstr "A yang Dipilih:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Pemformatan"
 
diff --git a/po/ko.po b/po/ko.po
index febc114..75809f8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1093,7 +1093,6 @@ msgid "Selected :"
 msgstr "선택된 인용():"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "형틀 짜기(Formatting)"
 
diff --git a/po/nb.po b/po/nb.po
index 3f06ac2..6ad7721 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1086,9 +1086,8 @@ msgid "Selected :"
 msgstr "Valgt referanser:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For"
+msgstr "Formatering"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/nl.po b/po/nl.po
index 0844c26..cf4fb40 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1110,7 +1110,6 @@ msgid "Selected :"
 msgstr " literatuurverwijzingen:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Opmaak"
 
diff --git 

Re: Copying translations from 2.2.x to master?

[Uwe Stöhr]

Hi Scott, I am still away for another week. I already transferred the po files 
from 2.2.x to master for all active translations . So please don't touch the po 
files in master. The translators will be informed that they only need to 
translate the giles in master for LyX 2.3. 

Regards Uwe  

  Original Message  
From: Scott Kostyshak
Sent: Freitag, 9. Juni 2017 20:28
To: LyX Developers; Uwe Stöhr; Georg Baum
Subject: Re: Copying translations from 2.2.x to master?

On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote:
> > Uwe,
> > 
> > Do you have time to copy the translations from 2.2.x to master? From
> > what I understand, you've done this in the past.
> > 
> > If Uwe doesn't have time, hopefully someone else can help or can tell me
> > what I should do.
> 
> I think Uwe is very busy. Does anyone else know how to do this? I'm not
> sure what to do.
> 
> I imagine I also need to solve the Windows linebreaks issue [1] before
> proceeding?
> 
> Georg, is your mergepo.py script meant for this purpose? I tested it by
> checking out zh_CN.po and de.po from 2.2.x, putting them in a directory
> ~/Desktop/2.2.x, and running
> 
> ./mergepo.py ~/Desktop/2.2.x
> 
> But it appears that nothing was updated:
> 
> Merging /home/scott/Desktop/2.2.x/de.po into ../../po/de.po: Updated 0
> translations with minimal diff.
> 
> Merging /home/scott/Desktop/2.2.x/zh_CN.po into ../../po/zh_CN.po:
> Updated 0 translations with minimal diff.
> 
> Unless someone has a different idea, I will replace the Windows
> linebreaks with non-Windows linebreaks, update the strings on master,
> and try the mergepo.py call above again.

Kornel has fixed the linebreaks issue, but mergepo.py still doesn't give
any output for me.

Uwe or Georg, you might be too busy to work on the issue yourself, but
can you describe some detailed steps for what I should do to merge the
2.2.x translations to master?

Scott

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote:
> > Uwe,
> > 
> > Do you have time to copy the translations from 2.2.x to master? From
> > what I understand, you've done this in the past.
> > 
> > If Uwe doesn't have time, hopefully someone else can help or can tell me
> > what I should do.
> 
> I think Uwe is very busy. Does anyone else know how to do this? I'm not
> sure what to do.
> 
> I imagine I also need to solve the Windows linebreaks issue [1] before
> proceeding?
> 
> Georg, is your mergepo.py script meant for this purpose? I tested it by
> checking out zh_CN.po and de.po from 2.2.x, putting them in a directory
> ~/Desktop/2.2.x, and running
> 
>   ./mergepo.py ~/Desktop/2.2.x
> 
> But it appears that nothing was updated:
> 
>   Merging /home/scott/Desktop/2.2.x/de.po into ../../po/de.po: Updated 0
>   translations with minimal diff.
> 
>   Merging /home/scott/Desktop/2.2.x/zh_CN.po into ../../po/zh_CN.po:
>   Updated 0 translations with minimal diff.
> 
> Unless someone has a different idea, I will replace the Windows
> linebreaks with non-Windows linebreaks, update the strings on master,
> and try the mergepo.py call above again.

Kornel has fixed the linebreaks issue, but mergepo.py still doesn't give
any output for me.

Uwe or Georg, you might be too busy to work on the issue yourself, but
can you describe some detailed steps for what I should do to merge the
2.2.x translations to master?

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

[Kornel Benko]

Am Mittwoch, 7. Juni 2017 um 09:29:31, schrieb Scott Kostyshak 

> On Wed, Jun 07, 2017 at 10:20:58AM +0200, Kornel Benko wrote:
> 
> > With 'make layouttranslations1' I get this change to lib/layouttranslations
> 
> I think you can push that. But we will have to run that again after
> merging translations from 2.2.x.
> 
> Scott

OK.

Kornel

signature.asc
Description: This is a digitally signed message part.

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Wed, Jun 07, 2017 at 10:20:58AM +0200, Kornel Benko wrote:

> With 'make layouttranslations1' I get this change to lib/layouttranslations

I think you can push that. But we will have to run that again after
merging translations from 2.2.x.

Scott

Re: Copying translations from 2.2.x to master?

[Kornel Benko]

Am Dienstag, 6. Juni 2017 um 15:53:13, schrieb Scott Kostyshak 

> On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
>
> > Unless someone has a different idea, I will replace the Windows
> > linebreaks with non-Windows linebreaks, update the strings on master,
> > and try the mergepo.py call above again.
>
> After Kornel's fixes to the Windows linebreaks, I tried mergepo.py again
> but it did not update any translations.
>
> Any other ideas?

?
With 'make layouttranslations1' I get this change to lib/layouttranslations

> Scott

Korneldiff --git a/lib/layouttranslations b/lib/layouttranslations
index ccaa31e..8694764 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -445,7 +445,7 @@ Translation fi
 	"List of Schemes" "Kuvausten luettelo"
 	"List of Tableaux" "Taulujen luettelo"
 	"Listing" "Listaus"
-	"Listings[[List of Listings]]" "Ohjelmalistausten luettelo"
+	"Listings[[List of Listings]]" "Listaukset"
 	"Notation" "Merkintätapa"
 	"Note" "Muistiinpano"
 	"Problem" "Ongelma"
@@ -775,7 +775,7 @@ Translation ja
 	"Listing" "プログラムリスト"
 	"Listings[[List of Listings]]" "プログラムリスト"
 	"Notation" "記法"
-	"Note" "注釈"
+	"Note" "註釈"
 	"Problem" "問題"
 	"Proof" "証明"
 	"Property" "性質"
@@ -1428,7 +1428,7 @@ Translation zh_CN
 	"List of Graphs[[mathematical]]" "图形列表"
 	"List of Schemes" "方案列表"
 	"List of Tableaux" "场景列表"
-	"Listing" "列表"
+	"Listing" "程序列表"
 	"Listings[[List of Listings]]" "列表列表"
 	"Notation" "记号"
 	"Note" "备忘"


signature.asc
Description: This is a digitally signed message part.

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:

> Unless someone has a different idea, I will replace the Windows
> linebreaks with non-Windows linebreaks, update the strings on master,
> and try the mergepo.py call above again.

After Kornel's fixes to the Windows linebreaks, I tried mergepo.py again
but it did not update any translations.

Any other ideas?

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

[Kornel Benko]

Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak 
> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote:
> 
> > > Unless someone has a different idea, I will replace the Windows
> > > linebreaks with non-Windows linebreaks, update the strings on master,
> > > and try the mergepo.py call above again.
> > 
> > I made a perl-script for this purpose (created and used for commit 52eee8e).
> > Should I add it to repo?
> 
> For the purpose of fixing the linebreaks

This one.

> or merging from branch? Either
> way, yes please commit.

OK.

> Scott

Kornel

signature.asc
Description: This is a digitally signed message part.

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote:

> > Unless someone has a different idea, I will replace the Windows
> > linebreaks with non-Windows linebreaks, update the strings on master,
> > and try the mergepo.py call above again.
> 
> I made a perl-script for this purpose (created and used for commit 52eee8e).
> Should I add it to repo?

For the purpose of fixing the linebreaks or merging from branch? Either
way, yes please commit.

Scott

Re: Copying translations from 2.2.x to master?

[Kornel Benko]

Am Samstag, 3. Juni 2017 um 20:07:39, schrieb Scott Kostyshak 
> On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote:
> > Uwe,
> > 
> > Do you have time to copy the translations from 2.2.x to master? From
> > what I understand, you've done this in the past.
> > 
> > If Uwe doesn't have time, hopefully someone else can help or can tell me
> > what I should do.
> 
> I think Uwe is very busy. Does anyone else know how to do this? I'm not
> sure what to do.
> 
> I imagine I also need to solve the Windows linebreaks issue [1] before
> proceeding?
> 
> Georg, is your mergepo.py script meant for this purpose? I tested it by
> checking out zh_CN.po and de.po from 2.2.x, putting them in a directory
> ~/Desktop/2.2.x, and running
> 
>   ./mergepo.py ~/Desktop/2.2.x
> 
> But it appears that nothing was updated:
> 
>   Merging /home/scott/Desktop/2.2.x/de.po into ../../po/de.po: Updated 0
>   translations with minimal diff.
> 
>   Merging /home/scott/Desktop/2.2.x/zh_CN.po into ../../po/zh_CN.po:
>   Updated 0 translations with minimal diff.
> 
> Unless someone has a different idea, I will replace the Windows
> linebreaks with non-Windows linebreaks, update the strings on master,
> and try the mergepo.py call above again.

I made a perl-script for this purpose (created and used for commit 52eee8e).
Should I add it to repo?

> Scott

Kornel

signature.asc
Description: This is a digitally signed message part.

Re: Copying translations from 2.2.x to master?

[Scott Kostyshak]

On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote:
> Uwe,
> 
> Do you have time to copy the translations from 2.2.x to master? From
> what I understand, you've done this in the past.
> 
> If Uwe doesn't have time, hopefully someone else can help or can tell me
> what I should do.

I think Uwe is very busy. Does anyone else know how to do this? I'm not
sure what to do.

I imagine I also need to solve the Windows linebreaks issue [1] before
proceeding?

Georg, is your mergepo.py script meant for this purpose? I tested it by
checking out zh_CN.po and de.po from 2.2.x, putting them in a directory
~/Desktop/2.2.x, and running

  ./mergepo.py ~/Desktop/2.2.x

But it appears that nothing was updated:

  Merging /home/scott/Desktop/2.2.x/de.po into ../../po/de.po: Updated 0
  translations with minimal diff.

  Merging /home/scott/Desktop/2.2.x/zh_CN.po into ../../po/zh_CN.po:
  Updated 0 translations with minimal diff.

Unless someone has a different idea, I will replace the Windows
linebreaks with non-Windows linebreaks, update the strings on master,
and try the mergepo.py call above again.

Scott


signature.asc
Description: PGP signature

Copying translations from 2.2.x to master?

[Scott Kostyshak]

Uwe,

Do you have time to copy the translations from 2.2.x to master? From
what I understand, you've done this in the past.

If Uwe doesn't have time, hopefully someone else can help or can tell me
what I should do.

Scott