Hello,
I'm new to this list and hope to help.
This patch correct the French translation for me (tested in English and French).
4 new messages have to be translated in other languages (not added).
Please commit (current r10281.
Regards.
--
Thierry
Index: src/net/sf/freecol/client/gui/panel/ColonyPanel.java
===================================================================
--- src/net/sf/freecol/client/gui/panel/ColonyPanel.java (revision 10281)
+++ src/net/sf/freecol/client/gui/panel/ColonyPanel.java (working copy)
@@ -153,7 +153,7 @@
private JButton buildQueueButton = new JButton(Messages.message("colonyPanel.buildQueue"));
- private JButton colonyUnitsButton = new JButton(Messages.message("Colony Units"));
+ private JButton colonyUnitsButton = new JButton(Messages.message("colonyPanel.colonyUnits"));
private JButton setGoodsButton
= (FreeColDebugger.isInDebugMode(FreeColDebugger.DebugMode.MENUS))
@@ -687,9 +687,10 @@
GoodsType goodsType = unit.getWorkType();
int producing = workingOnLand.getProductionOf(unit, goodsType);
unitIcon = imageLibrary.getUnitImageIcon(unit, 0.5);
- String menuTitle = new String(Messages.message(unit.getLabel())
- + " Producing: " + producing + " "
- + Messages.message(goodsType.getId() + ".name"));
+ String nominative = Messages.message(StringTemplate.template(
+ unit.getWorkType() + ".name").addAmount("%amount%", producing));
+ String menuTitle = new String(Messages.message(unit.getLabel()) + " " +
+ Messages.message("producing.name") + " " + producing + " " + nominative);
subMenu = new JMenuItem(menuTitle, unitIcon);
subMenu.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -705,8 +706,10 @@
GoodsType goodsType = unit.getWorkType();
int producing = workingInBuilding.getProductionOf(unit, workingInBuilding.getGoodsOutputType());
unitIcon = imageLibrary.getUnitImageIcon(unit, 0.5);
- String menuTitle = new String(Messages.message(unit.getLabel()) + " Producing: " + producing + " " +
- Messages.message(goodsType.getId() + ".name"));
+ String nominative = Messages.message(StringTemplate.template(
+ goodsType.getId() + ".name").addAmount("%amount%", producing));
+ String menuTitle = new String(Messages.message(unit.getLabel()) + " " +
+ Messages.message("producing.name") + " " + producing + " " + nominative);
subMenu = new JMenuItem(menuTitle, unitIcon);
subMenu.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -723,7 +726,8 @@
for (final Unit unit : colonyTile.getUnitList()) {
if(unit.isCarrier()){
unitIcon = imageLibrary.getUnitImageIcon(unit, 0.5);
- String menuTitle = new String(Messages.message(unit.getLabel()) + " In Port");
+ String menuTitle = new String(Messages.message(unit.getLabel()) +
+ " " + Messages.message("inPort.name"));
subMenu = new JMenuItem(menuTitle, unitIcon);
subMenu.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -739,7 +743,7 @@
menuTitle = new String(Messages.message(innerUnit.getLabel()) + " Cargo On " + Messages.message(unit.getLabel()));
subMenu = new JMenuItem(menuTitle, unitIcon);
subMenu.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(ActionEvent e) {
unitMenu.createUnitMenu(new UnitLabel(getFreeColClient(), innerUnit, getGUI()));
unitMenu.show(getGUI().getCanvas(), 0, 0);
}
@@ -750,10 +754,11 @@
}
}else if(!unit.isOnCarrier()){
unitIcon = imageLibrary.getUnitImageIcon(unit, 0.5);
- String menuTitle = new String(Messages.message(unit.getLabel()) + " Outside of Colony");
+ String menuTitle = new String(Messages.message(unit.getLabel()) +
+ " " + Messages.message("outsideOfColony.name"));
subMenu = new JMenuItem(menuTitle, unitIcon);
subMenu.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(ActionEvent e) {
unitMenu.createUnitMenu(new UnitLabel(getFreeColClient(), unit, getGUI()));
unitMenu.show(getGUI().getCanvas(), 0, 0);
}
Index: data/strings/FreeColMessages_fr.properties
===================================================================
--- data/strings/FreeColMessages_fr.properties (revision 10281)
+++ data/strings/FreeColMessages_fr.properties (working copy)
@@ -2516,3 +2516,7 @@
installer.UserFiles.home=Le dossier de base de l’utilisateur
installer.UserFiles.freecol=Le dossier de l’application FreeCol (seulement les installations pour un seul utilisateur)
installer.UserFiles.other=Définissez un dossier personnalisé
+colonyPanel.colonyUnits=Unités de la Colonie
+outsideOfColony.name=hors de la colonie
+inPort.name=au port
+producing.name=produisant
Index: data/strings/FreeColMessages_en_GB.properties
===================================================================
--- data/strings/FreeColMessages_en_GB.properties (revision 10281)
+++ data/strings/FreeColMessages_en_GB.properties (working copy)
@@ -13,3 +13,7 @@
model.foundingFather.hernandoDeSoto.description=Exploration of Lost City Rumours always yields a positive result and all land units have an extended sight radius.
model.foundingFather.henryHudson.text=English Navigator who explored and mapped a large area of the northeastern North American continent. Many waterways in that region are named in his honour. His original goal was to find the famed Northwest Passage.
model.foundingFather.benjaminFranklin.text=A heavy contributor to the Declaration of Independence, Franklin was one of the voices of the Revolution. He travelled extensively between Europe and the colonies gainined the support of the French in the war.
+colonyPanel.colonyUnits=Colony Units
+outsideOfColony.name=Outside of Colony
+inPort.name=In Port
+producing.name=Producing:
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
Freecol-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freecol-developers
