"Spanish translation added."

ChangeLog

@@ -1,6 +1,7 @@
 10/10/2005: v1.9.2
 	- fixed some minor bugs
 	- updated translations
+	- added Spanish translation
 	- switched from 'arj' to Gnu 'zip' in the Windows port
 	- added player streaks (hot/cold)
 	- added definition for the Netherlands (thanks to Zwakstroom)

configure.in

@@ -20,7 +20,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
 
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="de nl fr pl ro bg zh"
+ALL_LINGUAS="de nl fr pl ro bg zh es"
 AM_GLIB_GNU_GETTEXT
 
 AC_OUTPUT([

src/fixture.c

@@ -292,30 +292,49 @@ fixture_write_cup_round_robin(Cup *cup, gint cup_round, GPtrArray *teams)
     }
 
     if(cupround->randomise_teams)
-	teams = misc_randomise_g_pointer_array(teams);
+	g_ptr_array_sort_with_data(teams, (GCompareDataFunc)team_compare_func,
+			       GINT_TO_POINTER(TEAM_COMPARE_AV_SKILL));
 
-    cnt = 0;
     for(i=0;i<number_of_groups;i++)
     {
 	table_group[i].name = g_string_new(cup->name->str);
 	table_group[i].clid = cup->id;
 	table_group[i].round = cup_round;
-	table_group[i].elements = g_array_new(FALSE, FALSE, sizeof(TableElement));
-    
+	table_group[i].elements = g_array_new(FALSE, FALSE, sizeof(TableElement));    
 	teams_group[i] = g_ptr_array_new();
-
-	for(j=0;j<team_num + (i < plus_div);j++)
+    }
+    
+    cnt = 0;
+    if(!cupround->randomise_teams)
+    {
+	for(i=0;i<number_of_groups;i++)
+	    for(j=0;j<team_num + (i < plus_div);j++)
+	    {
+		g_ptr_array_add(teams_group[i],
+				g_ptr_array_index(teams, cnt));
+		new_table_element = 
+		    table_element_new((Team*)g_ptr_array_index(teams, cnt), table_group[i].elements->len);
+		g_array_append_val(table_group[i].elements, new_table_element);
+		cnt++;
+	    }	
+    }
+    else
+    {
+	for(i=0;i<teams->len;i++)
 	{
-	    g_ptr_array_add(teams_group[i],
-			    g_ptr_array_index(teams, cnt));
+	    g_ptr_array_add(teams_group[cnt],
+			    g_ptr_array_index(teams, i));
 	    new_table_element = 
-		table_element_new((Team*)g_ptr_array_index(teams, cnt), table_group[i].elements->len);
-	    g_array_append_val(table_group[i].elements, new_table_element);
-	    cnt++;
+		table_element_new((Team*)g_ptr_array_index(teams, i), table_group[cnt].elements->len);
+	    g_array_append_val(table_group[cnt].elements, new_table_element);
+	    cnt = (cnt + 1) % number_of_groups;
 	}
+    }
 
+    for(i=0;i<number_of_groups;i++)
+    {
 	g_array_append_val(cupround->tables, table_group[i]);
-	fixture_write_round_robin((gpointer)cup, cup_round, teams_group[i], !cupround->home_away);
+	fixture_write_round_robin((gpointer)cup, cup_round, teams_group[i], !cupround->home_away);	
     }
 
     g_ptr_array_free(teams, TRUE);

src/team.c

@@ -831,6 +831,9 @@ team_compare_func(gconstpointer a, gconstpointer b, gpointer data)
     }
     else if(type == TEAM_COMPARE_UNSORTED)
 	return_value = 0;
+    else if(type == TEAM_COMPARE_AV_SKILL)
+	return_value = misc_float_compare(team_get_average_skill(tm1, FALSE),
+					  team_get_average_skill(tm2, FALSE));
 
     return return_value;
 }

support_files/bygfoot_constants

@@ -718,9 +718,9 @@ int_name_max_product 2000
 # list instead of the specified one
 float_name_random_list_prob 20000
 
-string_language_names English Deutsch Français Nederlands Polski Romanian Bulgarian Chinese
-string_language_codes C de fr nl pl ro bg zh
-string_language_symbols flag_england.png flag_germany.png flag_france.png flag_nl.png flag_poland.png flag_romania.png flag_bulgaria.png flag_china.png
+string_language_names English Deutsch Français Spanish Nederlands Polski Romanian Bulgarian Chinese
+string_language_codes C de fr es nl pl ro bg zh
+string_language_symbols flag_england.png flag_germany.png flag_france.png flag_spain.png flag_netherlands.png flag_poland.png flag_romania.png flag_bulgaria.png flag_china.png
 
 # lower and upper limits of which percentage
 # of the player wages a sponsor pays; the actual