diff --git a/TODO.txt b/TODO.txt
index 00b84a305d43d2b23567d43a35bb3047c47857c9..a78d5aa9d9a32961fbdcf5ed7354ec76746b05d5 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -88,8 +88,3 @@ General tasks
- Add, extend or modify comments in PEAR syntax so that they can be read with phpdocumentor.
-
-Language editor
---------------------------------------
-- Merge: remove the line how exists in language to merge but not in main (removed in main because not use or change for fix)
-
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index 4f45724cc21ef9866f7cf976d3a9d1b278de4742..b0e36fefb7d6f3aa4e7d888ee2a4673c7667586d 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -112,6 +112,14 @@ function merge_langfile($langfile,$masterfile) {
$n++;
}
}
+
+ $r = 0;
+ foreach($wb as $key => $val) {
+ if(!isset($wb_master[$key])) {
+ unset($wb[$key]);
+ $r++;
+ }
+ }
$file_content = " $val) {
@@ -122,6 +130,8 @@ function merge_langfile($langfile,$masterfile) {
$file_content .= "?>\n";
$msg .= "Added $n lines to the file $langfile
";
+ if($r!=0)
+ $msg .= "Removed $r lines to the file $langfile
";
file_put_contents($langfile ,$file_content);
} else {
$msg .= "File does not exist yet. Copied file $masterfile to $langfile
";