Merge branch 'release/0.8.4'

Bojo38 · Feb 10, 2016 · 8cb8094 · 8cb8094
2 parents 994b4fe + 8a965c6
commit 8cb8094
Show file tree

Hide file tree

Showing 28 changed files with 3,903 additions and 33,802 deletions.
diff --git a/shrinklog.xml b/shrinklog.xml
diff --git a/src/teamma/languages/Translate.java b/src/teamma/languages/Translate.java
@@ -27,7 +27,7 @@ public static String translate(String key) {
         }
         catch(Exception e)
         {
-            tmp=key;
+            tmp="?"+key;
         }
         return tmp;
     }

diff --git a/src/tourma/MainFrame.java b/src/tourma/MainFrame.java
@@ -1338,16 +1338,17 @@ private void jmiGenerateFirstRoundActionPerformed(java.awt.event.ActionEvent evt
                     labels.add(Translate.translate(CS_FreeRound));
                     Options.add(Generation.GEN_FREE);
 
+                    /*
+                    OPTION NON CONCLUANTE
+                    
                     if (Tournament.getTournament().getParams().isTeamTournament()) {
                         if (Tournament.getTournament().getParams().getTeamPairing() == ETeamPairing.INDIVIDUAL_PAIRING) {
-                            /**
-                             * Balanced Options
-                             */
+                      // Balanced Options
                             labels.add(
                                     Translate.translate(CS_RandomAndBalancing));
                             Options.add(Generation.GEN_BALANCED);
                         }
-                    }
+                    }*/
 
                     final JPanel jpn = new JPanel(new BorderLayout());
                     final JComboBox jcb = new JComboBox(labels.toArray());