Merge pull request #54 from ManuelHu/master

Lokalisierung
OctoAwesome · Nov 19, 2015 · c6cc4b2 · c6cc4b2
2 parents 81053fc + 6d7b9d2
commit c6cc4b2
Show file tree

Hide file tree

Showing 37 changed files with 1,484 additions and 133 deletions.
diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/BlueCottonBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/BlueCottonBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class BlueCottonBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Blue Cotton"; }
+            get { return Languages.OctoBasics.BlueCotton; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/BrickBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/BrickBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class BrickBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Brick"; }
+            get { return Languages.OctoBasics.Brick; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/GrassBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/GrassBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class GrassBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Grass"; }
+            get { return Languages.OctoBasics.Grass; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/GreenCottonBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/GreenCottonBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class GreenCottonBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Green Cotton"; }
+            get { return Languages.OctoBasics.GreenCotton; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/GroundBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/GroundBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class GroundBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Ground"; }
+            get { return Languages.OctoBasics.Ground; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/IceBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/IceBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class IceBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Ice"; }
+            get { return Languages.OctoBasics.Ice; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/IronOreDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/IronOreDefinition.cs
@@ -20,7 +20,7 @@ public string Name
         {
             get
             {
-                return "Iron Ore";
+                return Languages.OctoBasics.IronOre;
             }
         }
 

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/LeavesBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/LeavesBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class LeavesBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Leaves"; }
+            get { return Languages.OctoBasics.Leaves; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/RedCottonBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/RedCottonBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class RedCottonBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Red Cotton"; }
+            get { return Languages.OctoBasics.RedCotton; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/SandBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/SandBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class SandBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Sand"; }
+            get { return Languages.OctoBasics.RedCotton; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/SnowBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/SnowBlockDefinition.cs
@@ -12,7 +12,7 @@ public override string Name
         {
             get
             {
-                return "Snow";
+                return Languages.OctoBasics.Snow;
             }
         }
 

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/StoneBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/StoneBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class StoneBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Stone"; }
+            get { return Languages.OctoBasics.Stone; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/StoneBrickBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/StoneBrickBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class StoneBrickBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Stone Brick"; }
+            get { return Languages.OctoBasics.StoneBrick; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/TanCottonBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/TanCottonBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class TanCottonBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Tan Cotton"; }
+            get { return Languages.OctoBasics.TanCotton; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/WaterBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/WaterBlockDefinition.cs
@@ -7,7 +7,7 @@ public sealed class WaterBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Water"; }
+            get { return Languages.OctoBasics.Water; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Blocks/WoodBlockDefinition.cs b/OctoAwesome/OctoAwesome.Basics/Blocks/WoodBlockDefinition.cs
@@ -11,7 +11,7 @@ public sealed class WoodBlockDefinition : BlockDefinition
     {
         public override string Name
         {
-            get { return "Wood"; }
+            get { return Languages.OctoBasics.Wood; }
         }
 
         public override Bitmap Icon

diff --git a/OctoAwesome/OctoAwesome.Basics/Languages/OctoBasics.Designer.cs b/OctoAwesome/OctoAwesome.Basics/Languages/OctoBasics.Designer.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ public string Name @@
             {
                 get
                 {
-                    return "Iron Ore";
+                    return Languages.OctoBasics.IronOre;
                 }
             }
@@ Expand Down @@