Merge pull request #342 from Adaptivity/dev

Update en_GB.lang

README.md

@@ -12,7 +12,7 @@ It is maintained by [Cricket](github.com/TheCricket), [tterrag](github.com/tterr
 Pull Requests
 ---------------
 
-Pull requests with new features, translations, and bufixes are very welcome. Please make sure to always submit PRs against the ***dev*** branch, not master.
+Pull requests with new features, translations, and bugfixes are very welcome. Please make sure to always submit PRs against the ***dev*** branch, not master.
 
 Do not make PRs that are solely formatting or other aesthetic things.
 
@@ -27,7 +27,7 @@ issue, please be sure to include:
 
 - The version of Chisel 2 you are using ("latest" is not an acceptable version)
 - The version of Forge you are using
-- If applicable, the crash report (preferrably via [Pastebin](http://pastebin.com/)). generated by the error
+- If applicable, the crash report (preferably via [Pastebin](http://pastebin.com/)). generated by the error
 - Depending on the error, an image of the problem
 
 Development Builds

src/main/resources/assets/chisel/lang/en_GB.lang

@@ -1,15 +1,31 @@
 # Only those localizations which need to be changed
 
+#AntiBlocks
+tile.antiBlock.silver.desc=Light Grey Anti Block
+tile.antiBlock.gray.desc=Grey Anti Block
+
+#Beacon
+tile.beacon.silver.desc=Light Grey Beamed Beacon
+tile.beacon.gray.desc=Grey Beamed Beacon
+
+#Void Stone Blocks
+tile.voidstoneRunic.gray.desc=Voidstone - Grey Rune
+tile.voidstoneRunic.lightgray.desc=Voidstone - Light Grey Rune
+
+#Futura
+tile.futuraCircuit.silver.desc=Light Grey
+tile.futuraCircuit.gray.desc=Grey
+
 #Hex Plating
 tile.hexPlating.15.desc=Grey Plating
 
 #Carpet
-tile.carpet_block.7.desc=Dark Grey Carpet Block
-tile.carpet_block.8.desc=Grey Carpet Block
+tile.carpet_block.7.desc=Grey Carpet Block
+tile.carpet_block.8.desc=Light Grey Carpet Block
 
 #Carpet floor
-tile.carpet.7.desc=Dark Grey Carpet
-tile.carpet.8.desc=Grey Carpet
+tile.carpet.7.desc=Grey Carpet
+tile.carpet.8.desc=Light Grey Carpet
 
 #Woollen Clay
 tile.chisel.woolen_clay.name=Woollen Clay
@@ -30,9 +46,39 @@ tile.woolenClay.13.desc=Green Woollen Clay
 tile.woolenClay.14.desc=Red Woollen Clay
 tile.woolenClay.15.desc=Black Woollen Clay
 
+#Colored Sand
+tile.coloredSand.7.desc=Grey Colored Sand
+tile.coloredSand.8.desc=Light Grey Colored Sand
+
 #Laboratory Block
 tile.laboratory.2.desc=Enamelled Wall
 tile.laboratory.3.desc=Enamelled Roundel Wall
 tile.laboratory.4.desc=Enamelled Wall Vents
 tile.laboratory.5.desc=Large Enamelled Tile
 tile.laboratory.6.desc=Small Enamelled Tiles
+
+#Stained Glass
+darkgray.bubble.desc=Grey Bubble Glass
+darkgray.glass.desc=Grey Glass Panel
+darkgray.glass.fancy.desc=Grey Fancy Glass Panel
+darkgray.glass.noborder.desc=Grey Borderless Glass
+
+lightgray.bubble.desc=Light Grey Bubble Glass
+lightgray.glass.desc=Light Grey Glass Panel
+lightgray.glass.fancy.desc=Light Grey Fancy Glass Panel
+lightgray.glass.noborder.desc=Light Grey Borderless Glass
+
+#Stained Glass Pane
+darkgray.pane.bubble.desc=Grey Bubble Glass
+darkgray.pane.glass.desc=Grey Glass Panel
+darkgray.pane.glass.fancy.desc=Grey Fancy Glass Panel
+darkgray.pane.glass.noborder.desc=Grey Borderless Glass
+darkgray.pane.glass.quadrant.desc=Grey Quadrant Glass
+darkgray.pane.glass.fancyquadrant.desc=Grey Fancy Quadrant Glass
+
+lightgray.pane.bubble.desc=Light Grey Bubble Glass
+lightgray.pane.glass.desc=Light Grey Glass Panel
+lightgray.pane.glass.fancy.desc=Light Grey Fancy Glass Panel
+lightgray.pane.glass.noborder.desc=Light Grey Borderless Glass
+lightgray.pane.glass.quadrant.desc=Light Grey Quadrant Glass
+lightgray.pane.glass.fancyquadrant.desc=Light Grey Fancy Quadrant Glass

src/main/resources/assets/chisel/lang/en_US.lang

@@ -1103,11 +1103,11 @@ tile.carpet_block.3.desc=Light Blue Carpet Block
 tile.carpet_block.4.desc=Yellow Carpet Block
 tile.carpet_block.5.desc=Light green Carpet Block
 tile.carpet_block.6.desc=Pink Carpet Block
-tile.carpet_block.7.desc=Dark Gray Carpet Block
-tile.carpet_block.8.desc=Gray Carpet Block
+tile.carpet_block.7.desc=Gray Carpet Block
+tile.carpet_block.8.desc=Light Gray Carpet Block
 tile.carpet_block.9.desc=Teal Carpet Block
 tile.carpet_block.10.desc=Purple Carpet Block
-tile.carpet_block.11.desc=Dark blue Carpet Block
+tile.carpet_block.11.desc=Blue Carpet Block
 tile.carpet_block.12.desc=Brown Carpet Block
 tile.carpet_block.13.desc=Green Carpet Block
 tile.carpet_block.14.desc=Red Carpet Block
@@ -1122,11 +1122,11 @@ tile.carpet.3.desc=Light Blue Carpet
 tile.carpet.4.desc=Yellow Carpet
 tile.carpet.5.desc=Light Green Carpet
 tile.carpet.6.desc=Pink Carpet
-tile.carpet.7.desc=Dark Gray Carpet
-tile.carpet.8.desc=Gray Carpet
+tile.carpet.7.desc=Gray Carpet
+tile.carpet.8.desc=Light Gray Carpet
 tile.carpet.9.desc=Teal Carpet
 tile.carpet.10.desc=Purple Carpet
-tile.carpet.11.desc=Dark Blue Carpet
+tile.carpet.11.desc=Blue Carpet
 tile.carpet.12.desc=Brown Carpet
 tile.carpet.13.desc=Green Carpet
 tile.carpet.14.desc=Red Carpet

src/main/resources/assets/chisel/lang/ru_RU.lang

@@ -1103,11 +1103,11 @@ tile.carpet_block.3.desc=Светло-синий ковровый блок
 tile.carpet_block.4.desc=Жёлтый ковровый блок
 tile.carpet_block.5.desc=Светло-зелёный ковровый блок
 tile.carpet_block.6.desc=Розовый ковровый блок
-tile.carpet_block.7.desc=Тёмно-серый ковровый блок
-tile.carpet_block.8.desc=Серый ковровый блок
+tile.carpet_block.7.desc=Серый ковровый блок
+tile.carpet_block.8.desc=Светло-Серый ковровый блок
 tile.carpet_block.9.desc=Бирюзовый ковровый блок
 tile.carpet_block.10.desc=Фиолетовый ковровый блок
-tile.carpet_block.11.desc=Тёмно-синий ковровый блок
+tile.carpet_block.11.desc=Синий ковровый блок
 tile.carpet_block.12.desc=Коричневый ковровый блок
 tile.carpet_block.13.desc=Зелёный ковровый блок
 tile.carpet_block.14.desc=Красный ковровый блок
@@ -1122,11 +1122,11 @@ tile.carpet.3.desc=Светло-синий ковёр
 tile.carpet.4.desc=Жёлтый ковёр
 tile.carpet.5.desc=Светло-зелёный ковёр
 tile.carpet.6.desc=Розовый ковёр
-tile.carpet.7.desc=Тёмно-серый ковёр
-tile.carpet.8.desc=Серый ковёр
+tile.carpet.7.desc=Серый ковёр
+tile.carpet.8.desc=Светло-серый ковёр
 tile.carpet.9.desc=Бирюзовый ковёр
 tile.carpet.10.desc=Фиолетовый ковёр
-tile.carpet.11.desc=Тёмно-синий ковёр
+tile.carpet.11.desc=Синий ковёр
 tile.carpet.12.desc=Коричневый ковёр
 tile.carpet.13.desc=Зелёный ковёр
 tile.carpet.14.desc=Красный ковёр