Farmer and product type added, cellular network updated, TODOs.txt updated:

[shipsimu.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 08601a27be83d7f4ac3d8b217fbe560dca9560b1..3617df026196b7894fe52a58b727eb4c60df030c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -217,6 +217,7 @@ application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php -text
 application/ship-simu/starter.php -text
 application/ship-simu/templates/.htaccess -text
 application/ship-simu/templates/de/.htaccess -text
+application/ship-simu/templates/de/.xml -text
 application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp -text
 application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp -text
 application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp -text
@@ -241,11 +242,97 @@ application/ship-simu/templates/de/code/login_form.ctp -text
 application/ship-simu/templates/de/code/login_main.ctp -text
 application/ship-simu/templates/de/code/logout_done.ctp -text
 application/ship-simu/templates/de/code/mail_debug.ctp -text
+application/ship-simu/templates/de/code/menu_entries_end.ctp -text
+application/ship-simu/templates/de/code/menu_entries_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_home_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_home_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_login_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_login_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_register_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_register_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_terms_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_terms_start.ctp -text
+application/ship-simu/templates/de/code/menu_footer_end.ctp -text
+application/ship-simu/templates/de/code/menu_footer_start.ctp -text
+application/ship-simu/templates/de/code/menu_global_end.ctp -text
+application/ship-simu/templates/de/code/menu_global_start.ctp -text
+application/ship-simu/templates/de/code/menu_header_end.ctp -text
+application/ship-simu/templates/de/code/menu_header_start.ctp -text
+application/ship-simu/templates/de/code/menu_text_end.ctp -text
+application/ship-simu/templates/de/code/menu_text_start.ctp -text
+application/ship-simu/templates/de/code/menu_title_home_end.ctp -text
+application/ship-simu/templates/de/code/menu_title_home_start.ctp -text
+application/ship-simu/templates/de/code/menu_title_law_end.ctp -text
+application/ship-simu/templates/de/code/menu_title_law_start.ctp -text
 application/ship-simu/templates/de/code/register_form.ctp -text
 application/ship-simu/templates/de/code/shipsimu_main.ctp -text
 application/ship-simu/templates/de/code/status.ctp -text
 application/ship-simu/templates/de/emails/.htaccess -text
 application/ship-simu/templates/de/emails/text_resend_link.tpl -text
+application/ship-simu/templates/de/game/!MISSING -text
+application/ship-simu/templates/de/game/.htaccess -text
+application/ship-simu/templates/de/game/building/.htaccess -text
+application/ship-simu/templates/de/game/building/base_building.xml -text
+application/ship-simu/templates/de/game/building/research_lab.xml -text
+application/ship-simu/templates/de/game/chemicals/.htaccess -text
+application/ship-simu/templates/de/game/company/.htaccess -text
+application/ship-simu/templates/de/game/container/.htaccess -text
+application/ship-simu/templates/de/game/container/base_container.xml -text
+application/ship-simu/templates/de/game/contract/.htaccess -text
+application/ship-simu/templates/de/game/contract/base_contract.xml -text
+application/ship-simu/templates/de/game/electronic/.htaccess -text
+application/ship-simu/templates/de/game/electronic/base_electronic.xml -text
+application/ship-simu/templates/de/game/electronic/cellphone.xml -text
+application/ship-simu/templates/de/game/engine/.htaccess -text
+application/ship-simu/templates/de/game/engine/base_engine.xml -text
+application/ship-simu/templates/de/game/farmer/.htaccess -text
+application/ship-simu/templates/de/game/farmer/base_farmer.xml -text
+application/ship-simu/templates/de/game/fuel/.htaccess -text
+application/ship-simu/templates/de/game/fuel/base_fuel.xml -text
+application/ship-simu/templates/de/game/merchant/.htaccess -text
+application/ship-simu/templates/de/game/merchant/base_merchant.xml -text
+application/ship-simu/templates/de/game/mineral/.htaccess -text
+application/ship-simu/templates/de/game/mineral/base_mineral.xml -text
+application/ship-simu/templates/de/game/research/.htaccess -text
+application/ship-simu/templates/de/game/research/base_research.xml -text
+application/ship-simu/templates/de/game/research/mathematics.xml -text
+application/ship-simu/templates/de/game/research/statics.xml -text
+application/ship-simu/templates/de/game/resource/.htaccess -text
+application/ship-simu/templates/de/game/resource/base_resource.xml -text
+application/ship-simu/templates/de/game/ship/.htaccess -text
+application/ship-simu/templates/de/game/ship/base_ship.xml -text
+application/ship-simu/templates/de/game/tank/.htaccess -text
+application/ship-simu/templates/de/game/tank/base_tank.xml -text
+application/ship-simu/templates/de/game/technology/.htaccess -text
+application/ship-simu/templates/de/game/technology/architecture.xml -text
+application/ship-simu/templates/de/game/technology/base_technology.xml -text
+application/ship-simu/templates/de/game/technology/cellular_network.xml -text
+application/ship-simu/templates/de/game/technology/drawings.xml -text
+application/ship-simu/templates/de/game/technology/glass_making.xml -text
+application/ship-simu/templates/de/game/technology/laboratory_equipment.xml -text
+application/ship-simu/templates/de/game/technology/naval_architecture.xml -text
+application/ship-simu/templates/de/game/technology/plastics.xml -text
+application/ship-simu/templates/de/game/types/.htaccess -text
+application/ship-simu/templates/de/game/types/building_types.xml -text
+application/ship-simu/templates/de/game/types/container_types.xml -text
+application/ship-simu/templates/de/game/types/content_types.xml -text
+application/ship-simu/templates/de/game/types/contract_types.xml -text
+application/ship-simu/templates/de/game/types/electronic_types.xml -text
+application/ship-simu/templates/de/game/types/engine_types.xml -text
+application/ship-simu/templates/de/game/types/farmer_types.xml -text
+application/ship-simu/templates/de/game/types/fuel_types.xml -text
+application/ship-simu/templates/de/game/types/merchant_types.xml -text
+application/ship-simu/templates/de/game/types/owner_occupants.xml -text
+application/ship-simu/templates/de/game/types/product_types.xml -text
+application/ship-simu/templates/de/game/types/research_types.xml -text
+application/ship-simu/templates/de/game/types/ship_types.xml -text
+application/ship-simu/templates/de/game/types/signer_types.xml -text
+application/ship-simu/templates/de/game/types/tank_types.xml -text
+application/ship-simu/templates/de/game/types/technology_types.xml -text
 application/ship-simu/templates/de/html/.htaccess -text
 application/ship-simu/templates/de/html/nav_advert.tpl -text
 application/ship-simu/templates/de/html/selector_ship-simu.tpl -text
@@ -254,6 +341,7 @@ application/ship-simu/templates/de/image/code_captcha.img -text
 application/ship-simu/templates/de/image/emergency_exit.img -text
 application/ship-simu/templates/de/menu/.htaccess -text
 application/ship-simu/templates/de/menu/base_menu.xml -text
+application/ship-simu/templates/de/menu/generic_menu_entries.xml -text
 /clear-cache.sh -text
 db/.htaccess -text
 db/company/.htaccess -text