11 files changed, 96 insertions, 81 deletions
diff --git a/locales/cn.lng b/locales/cn.lng
index a06a62b39..addf92924 100644
--- a/locales/cn.lng
+++ b/locales/cn.lng
@@ -173,7 +173,7 @@ Surftips==建议
 
 #File: Blog.html
 #---------------------------
-by==by
+#by==by
 Comments</a>==评论</a>
 >edit==>编辑
 >delete==>删除
@@ -214,7 +214,7 @@ Please select the XML-file you want to import:==请选择您想导入的XML文�
 
 #File: BlogComments.html
 #---------------------------
-by==by
+#by==by
 Comments</a>==评论</a>
 Login==登录
 Blog-Home==博客主页
@@ -465,7 +465,6 @@ Delete robots.txt Cache==删除robots.txt 缓存
 Language selection==语言选择
 You can change the language of the YaCy-webinterface with translation files.==您可以使用翻译文件来改变YaCy操作界面的语言.
 Current language</label>==当前语言</label>
-#default(english)==Deutsch
 Author(s) (chronological)</label>==作者(按时间排序)</label>
 Send additions to maintainer</em>==向维护者提交补丁</em>
 Available Languages</label>==可用语言</label>
@@ -1551,7 +1550,7 @@ Profile==资料
 Depth==深度
 Modified Date==修改日期
 Anchor Name==祖先名
-URL==URL
+#URL==URL
 [Delete]==[删除]
 Delete Entries:==已删除条目:
 "Delete"=="删除"
@@ -1573,7 +1572,7 @@ Profile==资料
 Depth==深度
 Modified Date==修改日期
 Anchor Name==祖先名
-URL==URL
+#URL==URL
 Delete==删除
 #-----------------------------        
 
diff --git a/locales/de.lng b/locales/de.lng
index ddc252971..57c59550a 100644
--- a/locales/de.lng
+++ b/locales/de.lng
@@ -546,7 +546,6 @@ Delete cached snippet-fetching failures during search==Lösche gecachte Snippet-
 Language selection==Sprachauswahl
 You can change the language of the YaCy-webinterface with translation files.==Hier können Sie die Sprache ändern. Wählen Sie die gewünschte Sprache aus der Liste aus.
 Current language</label>==Aktuelle Sprache</label>
-#default(english)==Deutsch
 Author(s) (chronological)</label>==Autoren (chronologisch)</label>
 Send additions to maintainer</em>==Schicken Sie Ergänzungen bitte an</em>
 Available Languages</label>==Verfügbare Sprachen</label>
@@ -1352,7 +1351,7 @@ only the given host(s)==Nur den/die angegebenen Host(s)
 addresses)==Addressen)
 Subnet<==Subnetz<
 Time-Out<==Timeout<
->Scan Cache<==>Scan Cache<
+#>Scan Cache<==>Scan Cache<
 accumulate scan results with access type "granted" into scan cache (do not delete old scan result)==Sammle Scan Ergebnisse mit dem Zugriffstyp "granted" im Scan Cache (Lösche keine alten Scan Ergebnisse)
 >Service Type<==>Service Typ<
 #>ftp==>FTP
diff --git a/locales/fr.lng b/locales/fr.lng
index 339f2f4fd..0505e244f 100644
--- a/locales/fr.lng
+++ b/locales/fr.lng
@@ -16,7 +16,7 @@
 # Only part 1.
 # Contributors are in chronological ordern, not how much they did absolutely.
 # Thank you for your help!
-<!-- lang -->default(english)==french
+<!-- lang -->default(english)==Français
 <!-- author -->==gDupont, Marsupoil, Mikay&eacute;
 <!-- maintainer -->==gDupont
 #-----------------------------
@@ -237,12 +237,11 @@ in 5 seconds.==dans 5 secondes
 #---------------------------
 Language selection==S&eacute;lection de la langue
 You can change the language of the YaCy-webinterface with translation files.==Vous pouvez changer de langue de l'interface web YaCy grace aux fichiers de traduction.
-Current language:==Langue actuelle:
-default(english)==Français
+Current language</label>==Langue actuelle</label>
 Languagefile Author(s) (chronological):==Auteur(s) des fichiers de langues (chronologique):
-Send additions to maintainer:==Envoyez les ajouts &agrave;:
-Available Languages:==Langues disponibles:
-Install new language from URL:==T&eacute;l&eacute;charcher une nouvelle langue:
+Send additions to maintainer</em>==Envoyez les ajouts &agrave;</em>
+Available Languages</label>==Langues disponibles</label>
+Install new language from URL==T&eacute;l&eacute;charcher une nouvelle langue
 Use this language==Utiliser cette langue:
 "Use"==Utiliser
 "Delete"==Supprimer
@@ -749,7 +748,7 @@ Profile==Profil
 Depth==Profondeur
 Modified Date==Date de modification
 Anchor Name==Nom d'ancre
-URL==URL
+#URL==URL
 [Delete]==[Supprimer]
 Delete Entries:==Entr&eacute;es supprim&eacute;es:
 "Delete"=="Supprimer"
@@ -2042,7 +2041,6 @@ This tag creates a horizontal line.==Ces tags cr&eacute;ent une ligne horizontal
 pagename==nom de page
 description==description
 This tag creates links to other pages of the wiki.==Ce tag tire un lien vers une autre page Wiki.
-url==URL
 This tag creates links to external websites.==Ce tag cr&eacute;e un lien vers une page internet externe.
 Image==Image
 alt==description
@@ -2186,8 +2184,6 @@ Ranking and Heuristics==Classement et heuristique
 
 #File: env/templates/simpleheader.template
 #---------------------------
-#File: env/templates/simpleheader.template
-#---------------------------
 Toggle navigation==Activer la navigation
 Search Interfaces==Interfaces de recherche
 Web Search==Recherche Web
@@ -2274,7 +2270,7 @@ Crawl Start==D&eacute;marrer le crawl
 >Loader==>Chargeur
 >Local==>Local
 #Global==Global
->Overhang==>Overhang
+#>Overhang==>Overhang
 >Images==>Images
 >Movies==>Films
 >Music==>Musique
diff --git a/locales/gr.lng b/locales/gr.lng
index 41557bb84..fa73b2581 100644
--- a/locales/gr.lng
+++ b/locales/gr.lng
@@ -50,13 +50,13 @@ These are the domain name / path patterns in this blacklist:==Αυτά είνα�
 You can select them here for deletion==Μπορείτε να τα επιλέξετε εδώ για διαγραφή
 Delete URL pattern==Διαγραφή του URL pattern
 Enter new domain name / path pattern in the form:==Βάλτε στη φόρμα ένα νέο όνομα χώρου (domain name)/διαδρομή
-path-regexpr==path-regexpr
+#path-regexpr==path-regexpr
 Add URL pattern==Προσθήκη ενός URL pattern
 Import blacklist items from other YaCy peers:==Εισαγωγή καταχωρήσεων από Μαύρες Λίστες άλλων ομότιμων χρηστών του YacY:
-Host:==Host:
+#Host:==Host:
 "Load new blacklist items"=="Φορτώστε νέες καταχωρήσεις στη Μαύρη Λίστα"
 Import blacklist items from URL:==Εισαγωγή καταχωρήσεων της Μαύρης Λίστας από την URL
-URL:==URL:
+#URL:==URL:
 "Load new blacklist items"=="Φορτώστε νέες καταχωρήσεις στη Μαύρη Λίστα"
 Import blacklist items from file:==Εισαγωγή καταχωρήσεων που βρίσκονται σε Μαύρες Λίστες, από το αρχείο:
 "Load new blacklist items"=="Φορτώστε νέες καταχωρήσεις στη Μαύρη Λίστα"
@@ -71,7 +71,7 @@ YaCy '#[clientname]#': Bookmarks==YaCy '#[clientname]#': Bookmarks
 <h2>Bookmarks==<h2>Bookmarks
 Add Bookmark==Προσθήκη Σελειδοδείκτη (Bookmark)
 Edit Bookmark==Τροποποίηση Σελειδοδείκτη (Bookmark)
-Url:==URL:
+#URL:==URL:
 Title:==Τίτλος:
 Description:==Περιγραφή:
 Tags (comma separated):==Tags (χωρισμένα με κόμματα):
diff --git a/locales/hi.lng b/locales/hi.lng
index 3c0647172..511b96619 100644
--- a/locales/hi.lng
+++ b/locales/hi.lng
@@ -98,7 +98,7 @@ a complete <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Patt
 Activate this list for==इस लिस्ट को सक्रिय करें
 Show entries:==एन्त्रिएस देखिये/दिखाएँ :
 Entries per page:==एन्तिरेस प्रति पेज :
-"Go"=="आगे बढे"
+#"Go"=="आगे बढे"
 Edit existing pattern(s):==मौजूदा पैटर्न (ओं) को एडिट करें  :
 "Save URL pattern(s)"=="यूआरएल पैटर्न (ओं) सेव करें "
 </body>==<script>window.onload = function () {$("label:contains('proxy')").text('प्रॉक्सी '); $("label:contains('crawler')").text('क्रेल्वेर '); $("label:contains('dht')").text('DHT'); $("label:contains('search')").text('खोज'); $("label:contains('surftips')").text('सर्फिंगटिप्स '); $("label:contains('news')").text('समाचार');}</script></body>
@@ -457,11 +457,11 @@ Delete robots.txt Cache==मिटाना robots.txt कैश
 #---------------------------
 Language selection==भाषा चयन
 You can change the language of the YaCy-webinterface with translation files.==आप अनुवाद फाइलों के साथ याची वेबिन्तेर्फास  की भाषा बदल सकते हैं
-Current language</label>==वर्तमान भाषा </ लेबल>
+Current language</label>==वर्तमान भाषा </label>
 #default(english)==# डिफ़ॉल्ट  (अंग्रेजी )
-Author(s) (chronological)</label>==लेखक  (एस )  (कालानुक्रमिक ) </ लेबल>
-Send additions to maintainer</em>==नुरक्षक </ em> के लिए फाईल भेजें
-Available Languages</label>==उपलब्ध भाषाएँ </ लेबल>
+Author(s) (chronological)</label>==लेखक  (एस )  (कालानुक्रमिक ) </label>
+Send additions to maintainer</em>==जोड़ भेजें मेंटेनर को</em>
+Available Languages</label>==उपलब्ध भाषाएँ </label>
 Install new language from URL==यूआरएल से नई भाषा को स्थापित करें
 Use this language==इस भाषा का प्रयोग करें
 "Use"=="प्रयोग"
@@ -582,7 +582,8 @@ If you leave the field empty, no peer asks your peer. If you fill in a '*', your
 #-----------------------------
 
 #File: ConfigParser.html
-#---------------------------Parser Configuration==पार्सर कॉन्फ़िगरेशन
+#---------------------------
+Parser Configuration==पार्सर कॉन्फ़िगरेशन
 Content Parser Settings==कंटेन्ट पार्सर सेटिंग्स
 With this settings you can activate or deactivate parsing of additional content-types based on their MIME-types.== इस सेटिंग के साथ आप अपने एम.आई.एमई प्रकार के आधार पर अतिरिक्त सामग्री प्रकार के पार्स को सक्रिय या निष्क्रिय कर सकते हैं.
 For a detailed description of the various MIME-types take a look at== विभिन्न एमआईएमई प्रकार की एक विस्तृत विवरण पर एक नज़र रखना
@@ -961,7 +962,7 @@ Create Bookmark==बुकमार्क बनाएँ
 Title<==शीर्षक<
 Folder<==फोल्डर<
 This option lets you create a bookmark from your crawl start URL.==यह विकल्प आपको अपने क्रॉल शुरू यूआरएल से एक बुकमार्क बनाने की सुविधा देता है.
-Crawling Depth</label>==रेंगने की गहराई </ लेबल>
+Crawling Depth</label>==रेंगने की गहराई</label>
 This defines how often the Crawler will follow links (of links..) embedded in websites.==इस ट्रेक लिंक  पालन करेंगे कितनी बार परिभाषित करता है (लिंक का .. ) वेबसाइटों में एम्बेडेड
 0 means that only the page you enter under "Starting Point" will be added==0 आप  तहत प्रवेश केवल पृष्ठ "शुरुआती बिंदु " जोड़ दिया जाएगा मतलब है कि
 to the index. 2-4 is good for normal indexing. Values over 8 are not useful, since a depth-8 crawl will==सूचकांक के लिए. 2-4 सामान्य अनुक्रमण के लिए अच्छा है. 8 से अधिक मान उपयोगी नहीं हैं, एक गहराई -8 क्रॉल जाएगा के बाद से
@@ -1085,7 +1086,7 @@ Scan Range==रेंज स्कैन
 Scan sub-range with given host==दिया मेजबान के साथ उप रेंज स्कैन
 Full Intranet Scan:==पूर्ण इंट्रानेट स्कैन:
 Do not use intranet scan results, you are not in an intranet environment!==इंट्रानेट परिणाम स्कैन का उपयोग न करें, आप एक इंट्रानेट वातावरण में नहीं कर रहे हैं!
->Scan Cache<==>Scan Cache<
+#>Scan Cache<==>Scan Cache<
 accumulate scan results with access type "granted" into scan cache (do not delete old scan result)==पहुंच प्रकार  "दी " स्कैन कैश  (पुराने स्कैन परिणाम  नष्ट नहीं है) में से परिणाम स्कैन जमा
 >Service Type<==>सेवा के प्रकार<
 #>ftp==>एफटीपी
diff --git a/locales/it.lng b/locales/it.lng
index 1d3036110..aa0777d40 100644
--- a/locales/it.lng
+++ b/locales/it.lng
@@ -24,8 +24,8 @@
 
 #File: Blacklist_p.html
 #---------------------------
-Blacklist Manager==Blacklist Manager
-Blacklist==Blacklist
+#Blacklist Manager==Blacklist Manager
+#Blacklist==Blacklist
 This function provides an URL filter to the proxy; any blacklisted URL is blocked==Questa funzione fornisce al proxy un filtro per le URL; le URL nella blacklist non vengono caricate
 from being loaded. You can define several blacklists and activate them separately.== Puoi definire diverse blacklist e acctivarle separatamente.
 You may also provide your blacklist to other peers by sharing them; in return you may==Puoi fornire la tua blacklist agli altri peers rendendola condivisa; in ritorno puoi
@@ -46,28 +46,28 @@ These are the domain name / path patterns in this blacklist:==Questi sono i domi
 You can select them here for deletion==Puoi selezionarli per la cancellazione
 Delete URL pattern==Cancella URL
 Enter new domain name / path pattern in the form:==Inserisci un nuovo dominio/path nella form
-path-regexpr==path-regexpr
+#path-regexpr==path-regexpr
 Add URL pattern==Aggiungi URL
 Import blacklist items from other YaCy peers:==Importa le blacklist dagli altri YacY peers:
-Host:==Host:
+#Host:==Host:
 "Load new blacklist items"=="Carica una nuova blacklist"
 Import blacklist items from URL:==Importa le entrate della blacklist dalla URL
-URL:==URL:
+#URL:==URL:
 "Load new blacklist items"=="Carica una nuova blacklist"
 Import blacklist items from file:==Importa le entrare delle blacklist dal file:
 "Load new blacklist items"=="Carica una nuova blacklist"
 was removed from blacklist==&egrave; stato rimosso dalla blacklist
 was added to the blacklist==&egrave; stato aggiunto alla blacklist
-File:==File:
+#File:==File:
 #-----------------------------
 
 #File: Bookmarks.html
 #---------------------------
-YaCy '#[clientname]#': Bookmarks==YaCy '#[clientname]#': Bookmarks
-<h2>Bookmarks==<h2>Bookmarks
+#YaCy '#[clientname]#': Bookmarks==YaCy '#[clientname]#': Bookmarks
+#<h2>Bookmarks==<h2>Bookmarks
 Add Bookmark==Aggiunti Bookmark
 Edit Bookmark==Modifica Bookmark
-Url:==URL:
+#URL:==URL:
 Title:==Titolo:
 Description:==Descrizione:
 Tags (comma separated):==Tags (separati da virgole):
diff --git a/locales/ja.lng b/locales/ja.lng
index f7a372575..09e76f655 100644
--- a/locales/ja.lng
+++ b/locales/ja.lng
@@ -231,7 +231,7 @@ Surftips==サーフティップス
 
 #File: Blog.html
 #---------------------------
-by==by
+#by==by
 Comments</a>==コメント</a>
 >edit==>編集
 >delete==>削除
@@ -272,7 +272,7 @@ Please select the XML-file you want to import:==あなたが取り込みたいXM
 
 #File: BlogComments.html
 #---------------------------
-by==by
+#by==by
 Comments</a>==コメント</a>
 Login==ログイン
 Blog-Home==ブログ-ホーム
diff --git a/locales/ru.lng b/locales/ru.lng
index c6deb839a..36903fdfc 100644
--- a/locales/ru.lng
+++ b/locales/ru.lng
@@ -915,7 +915,7 @@ Network pages==Страницам сети
 Surftips==Подсказкам
 News pages==Страницам новостей
 Blog==Блогу
-Wiki==Wiki
+#Wiki==Wiki
 Public bookmarks==Публичным закладкам
 Home Page==Домашней странице
 File Share==Общим файлам
@@ -3611,7 +3611,7 @@ Add & Edit Bookmark==Добавить и редактировать заклад
 Public:==Публичная
 yes==да
 no==нет
-URL:==URL
+#URL:==URL
 Title:==Заголовок
 Description:==Описание
 Folder (/folder/subfolder):==Папка (папка/подпапка)
@@ -3744,7 +3744,7 @@ View URL Content==Показать сведения об URL-адресе
 "Show Metadata"=="Показать метаданные"
 "Browse Host"=="Просмотр хоста"
 >URL Metadata<==>Метаданные<
-URL==URL
+#URL==URL
 Search in Document:==Поиск в документе:
 "Show Snippet"=="Показать фрагмент"
 Hash==Хэш
@@ -3852,7 +3852,7 @@ from page title (splitted)==из заголовка страницы (разде
 from page author==из страницы автора
 "Create"=="Создать"
 Vocabulary Editor==Редактор словаря
-This produces the following triples in the==Das produziert die folgenden Tripel im
+#This produces the following triples in the==Das produziert die folgenden Tripel im
 #>triplestore<==>triplestore<
 if a term or synonym matches in a document:==если значение или синоним совпадают в документе
 more Triples for linking into objectspace==больше трех ссылок на объект
diff --git a/locales/sk.lng b/locales/sk.lng
index af75e6669..e6e73d13f 100644
--- a/locales/sk.lng
+++ b/locales/sk.lng
@@ -25,7 +25,7 @@
 #File: Blacklist_p.html
 #---------------------------
 Blacklist Manager==Spravca blacklistu
-Blacklist==Blacklist
+#Blacklist==Blacklist
 This function provides an URL filter to the proxy; any blacklisted URL is blocked==Tato funkcia poskytuje URL filter pre proxy: URL adresa z blacklistu je blokovana 
 from being loaded. You can define several blacklists and activate them separately.==a nebude nahravana. Mozete definovat a nezavisle aktivovat niekolko blacklistov.
 You may also provide your blacklist to other peers by sharing them; in return you may==Vas blacklist mozete takisto poskytnut inemu peerovy na stiahnutie a naopak 
@@ -60,7 +60,7 @@ Add URL pattern==Pridaj URL masku
 "Load new blacklist items"=="Nahraj novy blacklist"
 # NOT USED
 #Import blacklist items from URL:==Importuj blacklist z URL adresy:
-URL:==URL:
+#URL:==URL:
 # NOT USED
 #Import blacklist items from file:==Importuj blacklist zo suboru: 
 was removed from blacklist==bol z blacklistu vymazany
@@ -192,13 +192,11 @@ location</a> in 10 seconds.==adresu</a> za 10 sekund.
 #---------------------------
 Language selection==V&yacute;ber jazyka
 You can change the language of the YaCy-webinterface with translation files.==Jazyk YaCy web rozhrania m&ocirc;zete zmenit pomocou prekladov&yacute;ch s&uacute;borov. Vyberte zvolen&yacute; jazyk zo zoznamu.
-Current language:==Aktu&aacute;lny jazyk
-# NOT USED
-#default(english)==Slovensky
+Current language</label>==Aktu&aacute;lny jazyk</label>
 Languagefile Author(s) (chronological):==Autor(y) jazykov&yacute;ch s&uacute;borov (chronologicky):
-Send additions to maintainer:==Pros&iacute;m po&scaron;lite zmeny maintainerovy na:
-Available Languages:==Podporovan&eacute; jazyky:
-Install new language from URL:==Nain&scaron;taluj nov&yacute; jazyk z URL adresy:
+Send additions to maintainer</em>==Pros&iacute;m po&scaron;lite zmeny maintainerovy na</em>
+Available Languages</label>==Podporovan&eacute; jazyky</label>
+Install new language from URL==Nain&scaron;taluj nov&yacute; jazyk z URL adresy
 Use this language==Tento jazyk ihned pouzit
 "Use"=="Pouzi"
 "Delete"=="Zmaz"
@@ -217,10 +215,10 @@ Name==Meno
 #Nick Name==Prez&yacute;vka
 Homepage==Domovsk&aacute; str&aacute;nka
 eMail==email
-ICQ==ICQ
-Jabber==Jabber
-Yahoo!==Yahoo!
-MSN==MSN
+#ICQ==ICQ
+#Jabber==Jabber
+#Yahoo!==Yahoo!
+#MSN==MSN
 Comment==Koment&aacute;r
 "Save"=="Uloz profil"
 #-----------------------------
@@ -1901,10 +1899,10 @@ Name==Meno
 #Nick Name==Prezyvka
 Homepage==Domovska stranka
 eMail==eMail
-ICQ==ICQ
-Jabber==Jabber
-Yahoo!==Yahoo!
-MSN==MSN
+#ICQ==ICQ
+#Jabber==Jabber
+#Yahoo!==Yahoo!
+#MSN==MSN
 Comment==Komentar
 #-----------------------------
 
@@ -2057,7 +2055,7 @@ Media Crawl Queues==Cakacia listina Media crawlu
 >Loader==>Nahravac
 >Local==>Lokal
 #Global==Global
->Overhang==>Overhang
+#>Overhang==>Overhang
 >Images==>Obrazky
 >Movies==>Filmy
 >Music==>Hudba
diff --git a/locales/uk.lng b/locales/uk.lng
index 6224cfc76..470d7fb37 100644
--- a/locales/uk.lng
+++ b/locales/uk.lng
@@ -97,7 +97,7 @@ a complete <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Patt
 Activate this list for==Активува цей список для
 Show entries:==Показати записи:
 Entries per page:==Записів на сторінку:
-"Go"=="Вперед"
+#"Go"=="Вперед"
 Edit existing pattern(s):==Редагувати поточні шаблони:
 "Save URL pattern(s)"=="Зберегти шаблон(и) URL"
 </body>==<script>window.onload = function () {$("label:contains('proxy')").text('проксі'); $("label:contains('crawler')").text('сканувача'); $("label:contains('dht')").text('DHT'); $("label:contains('search')").text('пошуку'); $("label:contains('surftips')").text('серфінгу'); $("label:contains('news')").text('новин');}</script></body>
@@ -1680,7 +1680,7 @@ Profile==Профіль
 Depth==Глибина
 Modified Date==Дата зміни
 Anchor Name==Ім’я якоря
-URL==URL
+#URL==URL
 [Delete]==[Видалити]
 Delete Entries:==Видалити записи:
 "Delete"=="Видалити"
@@ -1702,7 +1702,7 @@ Profile==Профіль
 Depth==Глибина
 Modified Date==Дата зміни
 Anchor Name==Ім’я якоря
-URL==URL
+#URL==URL
 Delete==Видалити
 #-----------------------------
 
@@ -4202,7 +4202,6 @@ Published&nbsp;News==Опубліковані
 #File: YaCySearchPluginFF.html
 #---------------------------
 Quick Crawl Link==Швидке сканування посилання
-/env/grafics/yacy.gif==/env/grafics/yacy.png
 Firefox Search Plugin==Пошукове доповнення Firefox
 Unable to install the firefox search plugin==Неможливо встановити пошукове розширення firefox
 #"General"=="Загалом"
diff --git a/source/net/yacy/utils/translation/TranslatorXliff.java b/source/net/yacy/utils/translation/TranslatorXliff.java
index 10a02bf7e..fbed357a4 100644
--- a/source/net/yacy/utils/translation/TranslatorXliff.java
+++ b/source/net/yacy/utils/translation/TranslatorXliff.java
@@ -31,6 +31,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
@@ -200,6 +201,34 @@ public class TranslatorXliff extends Translator {
     }
 
     /**
+     * Helper to write translation entries for one file
+     *
+     * @param filename relative path file name
+     * @param textlist the translation list for filename
+     * @param output output file
+     * @throws IOException
+     */
+    private void writeFileSection(final String filename, final Map<String, String> textlist, OutputStreamWriter output) throws IOException {
+        output.write("#File: " + filename + "\n"
+                + "#------------------------------\n"); // required in 1.2
+
+        for (String source : textlist.keySet()) {
+            String target = textlist.get(source);
+            // we use hashCode of source string to get same id in different xliff files for same translation text
+            if (target != null && !target.isEmpty()) { // omitt target text if not available
+                if (source.equals(target)) {
+                    output.write("#" + source + "==" + target + "\n"); // no translation needed (mark #)
+                } else {
+                    output.write(source + "==" + target + "\n");
+                }
+            } else {
+                output.write("#"+source + "==" + source + "\n"); // no translation available (mark #)
+            }
+        }
+        output.write("#------------------------------\n\n");
+    }
+
+    /**
      * Saves the internal translation map as XLIFF 1.2 file
      *
      * @param targetLanguage the target language code, if null target is omitted
@@ -210,7 +239,7 @@ public class TranslatorXliff extends Translator {
      *
      * @return true on success
      */
-    public boolean saveAsLngFile(final String targetLanguageCode, String lngFile, Map<String, Map<String, String>> lng) {
+    public boolean saveAsLngFile(final String targetLanguageCode, File lngFile, Map<String, Map<String, String>> lng) {
 
         OutputStreamWriter output;
 
@@ -223,22 +252,16 @@ public class TranslatorXliff extends Translator {
             output.write("# followed by the translations  OriginalText==TranslatedText\n");
             output.write("# Comment lines start with #\n\n");
 
-            for (String afilemap : lng.keySet()) {
-                output.write("#File: " + afilemap + "\n"
-                        + "#------------------------------\n"); // required in 1.2
-
-                Map<String, String> txtmap = lng.get(afilemap);
-                for (String source : txtmap.keySet()) {
-                    String target = txtmap.get(source);
-                    // we use hashCode of source string to get same id in different xliff files for same translation text
-                    if (target != null && !target.isEmpty()) { // omitt target text if not available
-                        output.write(source + "==" + target + "\n");
-                    } else {
-                        output.write(source + "==" + source + "\n");
-                    }
+            // special handling of "ConfigLanguage_p.html" to list on top of all other
+            // because of some important identifier
+            Map<String, String> txtmap = lng.get("ConfigLanguage_p.html");
+            writeFileSection("ConfigLanguage_p.html", txtmap, output);
 
+            for (String afilemap : lng.keySet()) {
+                txtmap = lng.get(afilemap);
+                if (!"ConfigLanguage_p.html".equals(afilemap)) {
+                    writeFileSection(afilemap, txtmap, output);
                 }
-                output.write("#------------------------------\n\n");
             }
             output.write("# EOF");
             output.close();