Merge 63f8ac740a into fc8ddf5ac8

data/strings/FreeColMessages_ms.properties

@@ -2772,7 +2772,7 @@ serverListPanel.gameState.0=Baru
 serverListPanel.gameState.1=Bermain
 serverListPanel.gameState.2=Siap
 serverListPanel.players=Pelayan
-startGamePanel.iAmReady=Saya Sedia
+startGamePanel.iAmReady=Saya Sudah Bersedia
 info.noEuropeans=Syarat kemenangan atas semua orang Eropah lain sudah disempurnakan. Anda perlu sama ada membolehkan satu lagi bangsa Eropah, atau tambahkan lagi syarat kemenangan.
 memoryManager.freeMemory=Bebas
 memoryManager.maxMemory=Maks

data/strings/FreeColMessages_pl_PL.properties

@@ -841,6 +841,7 @@ clientOptions.personal.shortDescription=Ustawienia specyficzne dla danego gracza
 model.option.playerName.name=Nazwa gracza:
 clientOptions.display.name=Grafika
 model.option.displayScaling.automatic=Automatyczny
+model.option.displayScaling.75=75 %
 model.option.displayScaling.100=100%
 model.option.displayScaling.125=125%
 model.option.displayScaling.150=150%

data/strings/FreeColMessages_ru.properties

@@ -14,6 +14,7 @@
 # Author: DCamer
 # Author: Deltaspace
 # Author: Diralik
+# Author: Dirruw'o
 # Author: Eleferen
 # Author: Eroha
 # Author: Eugenia.Chudinova
@@ -383,6 +384,7 @@ gotoTileAction.name=Перейти к клетке
 loadAction.name=Загрузить
 mapControlsAction.accelerator=Ctrl+M
 mapControlsAction.name=Управление картой
+mapEditorToolboxPanelAction.name=Инструменты
 mapEditorAction.name=Редактор карт
 mapGeneratorOptionsAction.accelerator=Shift+F12
 mapGeneratorOptionsAction.name=Показать настройки генератора карты

data/strings/FreeColMessages_zh_CN.properties

@@ -349,6 +349,7 @@ gotoAction.name=前往
 gotoTileAction.name=前往图块
 loadAction.name=加载
 mapControlsAction.name=地图控制
+mapEditorToolboxPanelAction.name=工具箱
 mapEditorAction.name=地图编辑器
 mapGeneratorOptionsAction.name=显示地图生成器选项
 miniMapToggleBordersAction.name=在政治和经济之间切换视角
@@ -3106,6 +3107,8 @@ indianSettlementPanel.learnableSkill=下列技能可以在这个部落被学会
 indianSettlementPanel.highlyWanted=这个部落对这种货物很感兴趣:
 indianSettlementPanel.otherWanted=其它可以在这个部落交易的货物包括:
 indianSettlementPanel.mostHated=在此定居最讨厌的国家：
+minimapPanel.title=小地图
+infoPanel.title=信息
 infoPanel.defenseBonus=防御奖励%bonus%%
 infoPanel.endTurn=请按回车键来结束回合。
 infoPanel.movementCost=活动%cost%
@@ -3118,6 +3121,9 @@ loadingSavegameDialog.serverName=服务器名称：
 loadingSavegameDialog.singlePlayer=单人游戏
 loadingSavegameDialog.name=读取存档中
 mapEditor.loadedWithMods=您已使用包含规范变更的活动模组启动了地图编辑器。请注意，每个加载使用模组中任何新内容的地图的用户都需要手动激活相同的模组。\n\n如果这不是故意的，您可以返回主菜单并通过首选项停用任何模组。
+mapEditor.chooseAreaModificationPanel.title=选择区域
+mapEditor.toolBoxPanel.title=工具箱
+mapEditor.tool.paintBrush.name=绘制
 mapEditorTransformPanel.chooseResource=选择资源
 mapEditorTransformPanel.majorRiver=大河
 mapEditorTransformPanel.minorRiver=小河

srcdata/audio/README

@@ -1,3 +0,0 @@
-This is where I drop off anything vaguely resembling a final version of any sound/music files I'm designing for possible future use with the game. Some of this may never get used, but it's here for everyone else to see. :)
-
-~Steven Melenchuk

srcdata/conceptual/README

@@ -1,4 +0,0 @@
-This repository is for source art, screencaptures, conceptual sketches,
-and other working art files.  Since these files can be rather large and
-disorderly, they are kept here instead of in the production art
-repository.