Re: Copying translations from 2.2.x to master?

[Kornel Benko]

Am Dienstag, 6. Juni 2017 um 15:53:13, schrieb Scott Kostyshak 
<skost...@lyx.org>
> 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

        Kornel
diff --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.