X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fupdate-gosa;h=55214d133d92abce2ba557858b96896ab11558e8;hb=cc3f5c3191eecad7ead7a2228753332952ebb2be;hp=1f08fd1fef26d48e8754eaeb1840d645778010b5;hpb=8199ea1d6743985a35777ddd745ee71b1cb935a1;p=gosa.git

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 1f08fd1fe..55214d133 100755
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -1,4 +1,4 @@
-#!/usr/bin/php5
+#!/usr/bin/php
 <?php
 /*
  * This code is part of GOsa (http://www.gosa-project.org)
@@ -177,7 +177,7 @@ function rescan_i18n()
 		}
 
 		/* Cat all these po files into one single file */
-		system ("(cd ".LOCALE_DIR." && msgcat ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
+		system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
 		if ($val != 0){
 			echo "Merging of message files failed - aborted";
 			exit (4);
@@ -188,6 +188,8 @@ function rescan_i18n()
 			exit (5);
 		}
 	}
+
+	echo "! Warning: you may need to reload your webservice!\n";
 }