Browse Source

manual merge

Edgardo Palza 7 years ago
parent
commit
fb28ce16e9
1 changed files with 4 additions and 7 deletions
  1. 4 7
      src/ui/view/Languages.java

+ 4 - 7
src/ui/view/Languages.java

@@ -36,21 +36,18 @@ public class Languages {
 
 
 	static String[] arrayDE = {
 	static String[] arrayDE = {
 			// ToolBar (0-16)
 			// ToolBar (0-16)
-			"Datei", "Neu", "Öffnen", "Speichern", "Bearbeiten", "Rückgängig", "Wiederherstellen", "Suchen/Ersetzen", "Gezeigte Informationen Ersetzen", "Optionen",
-			"Kategorien Zurücksetzen", "Ansicht", "Ansichtsgröße", "Hilfe", "Über Uns", "Kanten Bearbeiten", "Sprache",
+			"Datei", "Neu", "Öffnen", "Speichern", "Bearbeiten", "Rückgängig", "Wiederherstellen", "Suchen/Ersetzen",
+			"Gezeigte Informationen Ersetzen", "Optionen", "Kategorien Zurücksetzen", "Ansicht", "Ansichtsgröße",
+			"Hilfe", "Über Uns", "Kanten Bearbeiten", "Sprache",
 			// Tables (17-24)
 			// Tables (17-24)
 			"Objekt", "Nr.", "Geräte", "Energie", "Quantität", "Aktiviert", "Feld", "Information",
 			"Objekt", "Nr.", "Geräte", "Energie", "Quantität", "Aktiviert", "Feld", "Information",
 			// Graph (25-26)
 			// Graph (25-26)
-<<<<<<< HEAD
-			"None ", "Reset",
+			"Nichts ", "Zurücksetzen",
 			// Warning PopUps(27-30)
 			// Warning PopUps(27-30)
 			"Warning", "Do you want to save your current data?", "Do you really want to delete the Category ",
 			"Warning", "Do you want to save your current data?", "Do you really want to delete the Category ",
 			"Please select a Category or an Object in order to delete something.",
 			"Please select a Category or an Object in order to delete something.",
 			// Edit Edges Pop Up
 			// Edit Edges Pop Up
 			"Edit Showed Informations", "Show Total Energy of Objects", "Show Connection Properties", "Cancel" };
 			"Edit Showed Informations", "Show Total Energy of Objects", "Show Connection Properties", "Cancel" };
-=======
-			"Nichts ", "Zurücksetzen" };
->>>>>>> 2a5e2ab33446ce8ab32fe63a4729b69bf7fe2838
 
 
 	static String[] arrayCZ = {
 	static String[] arrayCZ = {
 			// ToolBar (0-16)
 			// ToolBar (0-16)