Merge pull request #4826 from cwisniew/fix_i18n

Fix the problems with out crowin updates
RPTools · Jun 6, 2024 · 1f6d128 · 1f6d128
2 parents d234ef2 + 2af4454
commit 1f6d128
Show file tree

Hide file tree

Showing 38 changed files with 49,206 additions and 5,325 deletions.
diff --git a/...n/java/net/rptools/maptool/client/ui/campaignproperties/CampaignPropertiesDialogView.form b/...n/java/net/rptools/maptool/client/ui/campaignproperties/CampaignPropertiesDialogView.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="net.rptools.maptool.client.ui.campaignproperties.CampaignPropertiesDialogView">
-  <grid id="6db9f" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="6db9f" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="5" left="5" bottom="5" right="5"/>
     <constraints>
-      <xy x="10" y="10" width="1079" height="720"/>
+      <xy x="10" y="10" width="1475" height="739"/>
     </constraints>
     <properties>
       <name value="mainForm"/>
@@ -12,7 +12,7 @@
     <children>
       <tabbedpane id="b1395">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -24,7 +24,7 @@
             </constraints>
             <properties>
               <name value="propertiesPanel"/>
-              <visible value="false"/>
+              <visible value="true"/>
             </properties>
             <border type="none"/>
             <children>
@@ -249,7 +249,7 @@
             </constraints>
             <properties>
               <name value="tokenStatesPanel"/>
-              <visible value="true"/>
+              <visible value="false"/>
             </properties>
             <border type="none"/>
             <children>
@@ -1043,7 +1043,7 @@
       <grid id="c0e" layout-manager="GridLayoutManager" row-count="1" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -1090,17 +1090,6 @@
               <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="CampaignPropertiesDialog.button.export.tooltip"/>
             </properties>
           </component>
-          <component id="a7c53" class="javax.swing.JButton">
-            <constraints>
-              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <actionCommand value="Import predefined"/>
-              <name value="importPredefinedButton"/>
-              <text resource-bundle="net/rptools/maptool/language/i18n" key="CampaignPropertiesDialog.button.importPredefined"/>
-              <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="CampaignPropertiesDialog.button.importPredefined.tooltip"/>
-            </properties>
-          </component>
           <component id="ce91c" class="javax.swing.JComboBox">
             <constraints>
               <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
@@ -1113,6 +1102,17 @@
           </component>
         </children>
       </grid>
+      <component id="a7c53" class="javax.swing.JButton">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <actionCommand value="Import predefined"/>
+          <name value="importPredefinedButton"/>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="CampaignPropertiesDialog.button.importPredefined"/>
+          <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="CampaignPropertiesDialog.button.importPredefined.tooltip"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties
@@ -782,8 +782,12 @@ CampaignPropertiesDialog.tab.sight     = Sight
 CampaignPropertiesDialog.tab.light     = Light
 CampaignPropertiesDialog.tab.states    = States
 CampaignPropertiesDialog.tab.bars      = Bars
+CampaignPropertiesDialog.button.importPredefined = Import Predefined
+CampaignPropertiesDialog.button.importPredefined.tooltip = Import predefined properties and settings for the selected system
+CampaignPropertiesDialog.button.import.tooltip = Import predefined properties from a file
+CampaignPropertiesDialog.button.export.tooltip = Export campaign properties to file
+CampaignPropertiesDialog.combo.importPredefined.tooltip = System to import properties for
 CampaignPropertiesDialog.button.import = Import Predefined
-CampaignPropertiesDialog.button.import.tooltip = Import predefined properties and settings for the selected system
 campaignPropertiesDialog.newTokenTypeName = Enter the name for the new token type
 campaignPropertiesDialog.newTokenTypeTitle = New Token Type
 campaignPropertiesDialog.newTokenTypeDefaultName = New Token Type {0}
@@ -802,6 +806,14 @@ campaignPropertiesTable.column.gmStatSheet = GM
 campaignPropertiesTable.column.ownerStatSheet = Owner
 campaignPropertiesTable.column.defaultValue = Default
 
+campaignPropertiesTable.column.name.description = The actual name of the property, used by the application.
+campaignPropertiesTable.column.shortName.description = Short version of the property name. Used in stat-sheets and character sheets.
+campaignPropertiesTable.column.displayName.description = Display version of the property name. Used in stat-sheets and character sheets.
+campaignPropertiesTable.column.statSheet.description = Show the property on the stat-sheet.
+campaignPropertiesTable.column.gm.description = Restrict visibility to the GM view of the stat-sheet.
+campaignPropertiesTable.column.owner.description = Restrict visibility to the owner's view of the stat-sheet.
+campaignPropertiesTable.column.default.description = The default value assigned to the property.
+
 # Bar propertyType
 CampaignPropertiesDialog.combo.bars.type.twoImages      = Two Images
 CampaignPropertiesDialog.combo.bars.type.singleImage    = Single Image
@@ -1117,15 +1129,23 @@ CampaignPropertiesDialog.label.mouse   = Mouseover:
 CampaignPropertiesDialog.label.order   = Order:
 CampaignPropertiesDialog.label.order.tooltip = Position in the list of states, change to move up or down the list.
 CampaignPropertiesDialog.label.else    = Everybody Else
-CampaginPropertiesDialog.label.owner   = Owner
+CampaignPropertiesDialog.label.owner   = Owner
 
 TextureChooserPanel.title = Texture
 
 TokenPropertiesPanel.label.list        = List the token properties for this token type below, one property per line:
 TokenPropertiesPanel.label.type        = Token Type
-TokenPropertiesPanel.label.statSheet   = Stat Sheet
-TokenPropertiesPanel.button.statSheetProps = Stat Sheet Properties
+TokenPropertiesPanel.label.statSheet   = Stat-Sheet
+TokenPropertiesPanel.combo.statSheet.tooltip = The default stat-sheet to use for this token type
+TokenPropertiesPanel.combo.statSheetLocation.tooltip = The default display position for the stat-sheet
+TokenPropertiesPanel.button.statSheetProps = Stat-Sheet Properties
 TokenPropertiesPanel.button.setAsDefault = Set as Default
+TokenPropertiesPanel.button.setAsDefault.tooltip = Make this the default type for all new tokens
+TokenPropertiesPanel.button.add.tooltip = Create a new token type
+TokenPropertiesPanel.button.addProperty.tooltip = Add a new property to the list
+TokenPropertiesPanel.button.deleteProperty.tooltip = Remove selected property from the list
+TokenPropertiesPanel.button.propertyUpDown.tooltip = Change the list position of the property
+TokenPropertiesPanel.button.delete.tooltip = Delete the token type and its associated properties
 TokenPropertiesPanel.defaultPropertyType = Default Property Type