Fixed empty list in synchronization, if there is no DB available

lang/add_message.sh

@@ -1,3 +1,4 @@
+<?php
 #!/bin/bash
 # $Id$
 #
@@ -14,19 +15,18 @@ fi
 for file in *.inc.php
 do
     echo $file " "
-    grep -v '?>' ${file} > ${file}.new
     case $file in
         english*)
             echo "$1 = '"$2"';" >> ${file}.new
             ;;
         *)
-            echo "$1 = '"$2"';  //to translate" >> ${file}.new
             ;;
     esac
-    echo "?>" >> ${file}.new
     rm $file
     mv ${file}.new $file
 done
 ./sort_lang.sh english*
 echo " "
 echo "Message added to all message files (including english)"
+
+?>

lang/add_message_file.sh

@@ -1,8 +1,8 @@
+<?php
 #!/bin/bash
 # $Id$
 #
 # Shell script that adds a message file to all message files
-# adding "//to translate" on each line
 #
 # Example:  add_message_file.sh  xxx
 #
@@ -14,7 +14,6 @@ fi
 for file in *.inc.php
 do
     echo $file " "
-    grep -v '?>' ${file} > ${file}.new
     case $file in
         english*)
             sed -n 's/\(.*\);/\1;/p' $1 >> ${file}.new
@@ -23,10 +22,11 @@ do
             sed -n 's/\(.*\);/\1;  \/\/to translate/p' $1 >> ${file}.new
             ;;
     esac
-    echo "?>" >> ${file}.new
     rm $file
     mv ${file}.new $file
 done
 ./sort_lang.sh english*
 echo " "
 echo "Messages added to add message files (including english)"
+
+?>

lang/check_lang.sh

@@ -1,3 +1,4 @@
+<?php
 #!/bin/sh
 # $Id$
 ##
@@ -29,7 +30,6 @@ do
     awk "/$STRINGMATCH/ && ! /$IGNOREMATCH/ { print \$1 }" $f | sort > $TMPDIR/$f
 done
 
-
 # Build the diff files used for checking
 # And if there are no differences, delete the empty files
 echo "Comparing data"
@@ -60,3 +60,5 @@ echo "Dupe = Duplicate Variables"
 echo "Miss = Missing Variables"
 echo "For exact problem listings, look in the $TMPDIR/ directory"
 echo "Please remember to remove '$TMPDIR/' once you are done"
+
+?>

lang/remove_message.sh

@@ -1,3 +1,4 @@
+<?php
 #!/bin/bash
 # $Id$
 #
@@ -21,3 +22,5 @@ do
     echo " lines after:" `wc -l $file`
 done
 echo " "
+
+?>

lang/slovak-utf-8.inc.php

@@ -1058,12 +1058,17 @@ $strBLOBRepositoryRemove = 'Remove BLOB Repository Reference';  //to translate
 $strBLOBRepositoryRepair = 'Repair';  //to translate
 $strBLOBRepositoryUpload = 'Upload to BLOB repository';  //to translate
 
+$strClickToSelect = 'Click to select';  //to translate
+$strClickToUnselect = 'Click to unselect';  //to translate
+
 $strDataDiff = 'Data Difference';  //to translate
 $strDataSyn = 'Data Synchronization';  //to translate
 $strDeleteRelation = 'Delete relation';  //to translate
 $strDesignerHelpDisplayField = 'The display field is shown in pink. To set/unset a field as the display field, click the "Choose field to display" icon, then click on the appropriate field name.';  //to translate
 $strDetails = 'Details...';  //to translate
+$strDifference = 'Difference';  //to translate
 $strDocSQL = 'DocSQL';  //to translate
+$strDumpAllRows = 'Dump all rows';  //to translate
 
 $strErrorRelationAdded = 'Error: Relation not added.';  //to translate
 $strErrorRelationExists = 'Error: relation already exists.';  //to translate
@@ -1075,6 +1080,7 @@ $strForeignKeyRelationAdded = 'FOREIGN KEY relation added';  //to translate
 $strFullStart = 'Full start';  //to translate
 $strFullStop = 'Full stop';  //to translate
 
+$strHaveBeenSynchronized = 'Selected target tables have been synchronized with source tables.';  //to translate
 $strHexForBLOB = 'Use hexadecimal for BLOB';  //to translate
 $strHideShowAll = 'Hide/Show all';  //to translate
 $strHideShowNoRelation = 'Hide/Show Tables with no relation';  //to translate
@@ -1094,6 +1100,9 @@ $strInternalRelationAdded = 'Internal relation added';  //to translate
 
 $strMediaWiki = 'MediaWiki Table';  //to translate
 
+$strNoDatabaseAvailable = 'No database available';  //to translate
+$strNotPresent = 'not present';  //to translate
+
 $strPBXTCheckpointFrequency = 'Checkpoint frequency';  //to translate
 $strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.';  //to translate
 $strPBXTDataFileGrowSize = 'Data file grow size';  //to translate
@@ -1130,6 +1139,8 @@ $strPrivDescProcess = 'Allows viewing processes of all users';  //to translate
 $strPrivDescTrigger = 'Allows creating and dropping triggers';  //to translate
 $strProfiling = 'Profiling';  //to translate
 
+$strQueriesExecuted = 'The following queries have been executed:';  //to translate
+
 $strRebuild = 'Rebuild';  //to translate
 $strRecommended = 'recommended';  //to translate
 $strRelationDeleted = 'Relation deleted';  //to translate
@@ -1442,6 +1453,7 @@ $strSetupServers_relation_desc = 'Leave blank for no [a@http://wiki.phpmyadmin.n
 $strSetupServers_relation_name = 'Relation table';  //to translate
 $strSetupServers_socket_desc = 'Socket on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
+$strSetupServers_ssl_desc = 'Enable SSL for connection to MySQL server';  //to translate
 $strSetupServers_ssl_name = 'Use SSL';  //to translate
 $strSetupServers_table_coords_desc = 'Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]';  //to translate
 $strSetupServers_table_coords_name = 'PDF schema: table coordinates';  //to translate
@@ -1542,6 +1554,7 @@ $strSynchronizationNote='Target database will be completely synchronized with so
 $strTableAlterIndex = 'Alter index(s)';  //to translate
 $strTableApplyIndex = 'Apply index(s)';  //to translate
 $strTableDeleteRows = 'Would you like to delete all the previous rows from target tables?';  //to translate
+$strTargetDatabaseHasBeenSynchronized = 'Target database has been synchronized with source database';  //to translate
 $strTexyText = 'Texy! text';  //to translate
 $strToFromPage = 'to/from page';  //to translate
 $strToSelectRelation = 'To select relation, click :';  //to translate
@@ -1616,13 +1629,4 @@ $strXMLExportTables = 'Export tables';  //to translate
 $strXMLExportTriggers = 'Export triggers';  //to translate
 $strXMLExportViews = 'Export views';  //to translate
 
-$strQueriesExecuted = 'The following queries have been executed:';  //to translate
-$strHaveBeenSynchronized = 'Selected target tables have been synchronized with source tables.';  //to translate
-$strDumpAllRows = 'Dump all rows';  //to translate
-$strDifference = 'Difference';  //to translate
-$strNotPresent = 'not present';  //to translate
-$strSetupServers_ssl_desc = 'Enable SSL for connection to MySQL server';  //to translate
-$strClickToSelect = 'Click to select';  //to translate
-$strClickToUnselect = 'Click to unselect';  //to translate
-$strTargetDatabaseHasBeenSynchronized = 'Target database has been synchronized with source database';  //to translate
 ?>

lang/sort_lang.sh

@@ -1,3 +1,4 @@
+<?php
 #!/bin/sh
 # $Id$
 ##
@@ -27,7 +28,6 @@ sortlang()
     targetdir=tmp-$f
     mkdir -p $targetdir
 
-    TRANSLATIONSTRING='//.*translate.*$'
     STRINGSTRING='^\$str[[:alnum:]_]+'
     WHITESPACE='^[[:blank:]]*$'
     CVSID='/\* \$Id$ \*/'
@@ -35,7 +35,6 @@ sortlang()
     echo -n "Extracting:"
     echo -n " head"
     egrep -i -v $TRANSLATIONSTRING $f | \
-    egrep -v "$STRINGSTRING|$CVSID|\?>|<\?php" >> $targetdir/head
 
     echo -n " cvs"
     egrep "$CVSID" $f >>$targetdir/cvs
@@ -54,7 +53,6 @@ sortlang()
 
     echo -n " pending_translations"
     if [ -s $targetdir/tmp-translate ] ; then
-        echo '// To translate:' > $targetdir/translate
         specialsort $targetdir/tmp-translate $targetdir/translate
     else
         echo -n > $targetdir/translate
@@ -62,10 +60,8 @@ sortlang()
     echo
 
     echo "Assembling final"
-    echo "<?php" > $f
     cat $targetdir/cvs $targetdir/head $targetdir/sort $targetdir/translate \
     | uniq >> $f
-    echo "?>" >> $f
 
     rm -rf $targetdir
 }
@@ -81,3 +77,5 @@ do
     fi
     echo "-------------------------------------------------------------------"
 done;
+
+?>

lang/translatecount.sh

@@ -1,3 +1,4 @@
+<?php
 #!/bin/sh
 # $Id$
 ##
@@ -10,7 +11,6 @@
 ##
 srcfilelist=${@}
 destfilelist=""
-translationmatch='//to translate'
 suffixtoremove='.inc.php'
 added=0
 if [ -z "${srcfilelist}" ]; then
@@ -29,3 +29,5 @@ destfilelist=`echo ${destfilelist} | xargs -n1 | egrep '.inc.php$'`
 if [ ! -z "${destfilelist}" ]; then
   grep -c -- "${translationmatch}" ${destfilelist} | sort -t':' -n +1  | sed -e "s/${suffixtoremove}//g" | xargs -n1 | egrep -v ':0$' 
 fi;
+
+?>

libraries/replication_gui.lib.php

@@ -283,6 +283,7 @@ function PMA_replication_gui_master_addslaveuser() {
 	. '<input type="hidden" name="createdb" id="createdb_0" value="0" />' . "\n"
         . '<input id="checkbox_Repl_slave_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_slave_priv"/>'. "\n"
         . '<input id="checkbox_Repl_client_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_client_priv"/>'. "\n"
+	. '' . "\n"
         . '<input type="hidden" name="sr_take_action" value="true" />'. "\n"
         . '<div class="item">' . "\n"
         . '<label for="select_pred_username">' . "\n"

server_synchronize.php

@@ -1158,15 +1158,19 @@ if (isset($_REQUEST['synchronize_db'])) {
 	</tr>
 	<tr class="even" id="'.$type.'tr7" style="display: none;">
 	    <td>'. $GLOBALS['strDatabase']. '</td>
-	    <td>
+	    <td>';
-	      <select name="'.$type.'_db_sel">
+	if (count($databases)==2) {
-	';
+		echo $GLOBALS["strNoDatabaseAvailable"]; // TODO: move to LANG file
-	foreach ($databases as $db) {
+	} else {
-	    if ($db['SCHEMA_NAME'] != 'mysql'
+		echo '
-             && $db['SCHEMA_NAME'] != 'information_schema') { 
+	      	<select name="'.$type.'_db_sel">
-                 echo '		<option>' . $db['SCHEMA_NAME'] . '</option>'."\n";
+		';
-        }
+		foreach ($databases as $db) {
-	}  
+	    		if ($db['SCHEMA_NAME'] != 'mysql'
+             	       	  && $db['SCHEMA_NAME'] != 'information_schema')  
+                 		echo '		<option>' . $db['SCHEMA_NAME'] . '</option>'."\n";
+		}  
+	}
 	echo '
 	      </select>
 	    </td>