diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 4ee35090d3f705a467618f42b59a4c13931abca8..55214d133d92abce2ba557858b96896ab11558e8 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
-#!/usr/bin/php5
+#!/usr/bin/php
<?php
/*
* This code is part of GOsa (http://www.gosa-project.org)
<?php
/*
* This code is part of GOsa (http://www.gosa-project.org)
}
/* Cat all these po files into one single file */
}
/* 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);
if ($val != 0){
echo "Merging of message files failed - aborted";
exit (4);