Merge branch 'itemcategories'

diff --cc AndorsTrail/res/values/strings.xml
index 067a55646a2ac0a6b6e9181f50e551b7379cf23a,76a094f72bd12c7ae6b0e939ba10a679fe5b1788..6e3ef90a983afd8a67cc9d26ff209ca7f61166d6
--- 1/AndorsTrail/res/values/strings.xml
--- 2/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@@ -504,12 -504,10 +504,17 @@@
      <string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
  
      <string name="about_button4">About</string>
 +    <string name="preferences_ui_category">Interface</string>
 +    <string name="preferences_ui_enable_animations_title">Enable animations</string>
 +    <string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
 +    <string name="menu_button_worldmap">Map</string>
 +    <string name="menu_button_worldmap_failed">Map cannot be displayed.</string>
 +    <string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
 +    <string name="display_worldmap_title">Map</string>
      
+       <!-- =========================================== -->
+       <!-- Added in v0.6.12 -->
+       
+       <string name="inventory_equip_offhand">Equip (offhand)</string>
+       
  </resources>

diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
Simple merge

diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
Simple merge

diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
Simple merge