Re: removing scons

[Peter Kümmel]

On 21.10.2011 14:30, Pavel Sanda wrote:

Peter Kümmel wrote:

i would be happy to know whether complete remerge of strings with
cmake on windows setup gives completely identical .po files as with
autotools remerge. scons remerge were not compatible and we spent
megabytes (literally) of storage just because of the cosmetic and
newline issues (i actually suspect that two-digit percentage of our
git repo is spent just for this nonsense).

anyone on win willing to test?

I could test it.  What files after running which tool should I check?

update svn tree to r39901. remerge .po strings with cmake and diff sk.po
against the current trunk sk.po. how the diff looks like?

After the last patches the patch looks ok.

pavel

--- E:/sandbox/lyx/trunk/po/sk39.po	Sa Okt 22 01:27:20 2011
+++ E:/sandbox/lyx/trunk/po/sk.po	Sa Okt 22 01:28:03 2011
@@ -1,15 +1,15 @@
 # Slovak translation of LyX
 # Copyright (C) 2003, 2006
 # Zdenko Podobný <z...@mailbox.sk>
-# 
+#
 # Kornel Benko <kornel.be...@berlin.de>, 2009.
 # Kornel Benko <kor...@lyx.org>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2011-10-22 01:26+0200\n"
-"PO-Revision-Date: 2011-10-17 15:04+0200\n"
+"POT-Creation-Date: 2011-10-21 15:13+0200\n"
+"PO-Revision-Date: 2011-10-21 15:16+0200\n"
 "Last-Translator: Kornel Benko <kor...@lyx.org>\n"
 "Language-Team: Slovak <lyx-d...@lists.lyx.org>\n"
 "Language: sk\n"
@@ -438,9 +438,9 @@
 msgid "Select your branch"
 msgstr "Vyberte svoju vetvu"
 
-#: src/frontends/qt4/ui/BranchesUi.ui:25 src/frontends/qt4/ui/IndicesUi.ui:114
-msgid "&New:"
-msgstr "&Nové:"
+#: src/frontends/qt4/ui/BranchesUi.ui:25
+msgid "&New:[[branch]]"
+msgstr "Nová:"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:35
 msgid ""
@@ -1929,6 +1929,10 @@
 msgid "&Use multiple indexes"
 msgstr "Použiť viacnásobné indexy"
 
+#: src/frontends/qt4/ui/IndicesUi.ui:114
+msgid "&New:[[index]]"
+msgstr "Nový:"
+
 #: src/frontends/qt4/ui/IndicesUi.ui:124
 msgid ""
 "Enter the name of the desired index (e.g. \"Index of Names\") and hit \"Add\""
@@ -24314,6 +24318,9 @@
 msgid "Unknown user"
 msgstr "Neznámy používateľ"
 
+#~ msgid "&New:"
+#~ msgstr "&Nové:"
+
 #~ msgid "Enter the command to load the language package (default: babel)"
 #~ msgstr "Zadajte príkaz na nahranie jazykového balíku (štandardne babel)"