1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

new feature: 'Move item' assignment allows quick and easy mass transfer of items between city sectors.

Browse Source 
Warning: GameDir >= r1723 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-11 15:22:29 +00:00
parent fd8b146296
commit 8171fdbe7e
22 changed files with 1045 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/_ChineseText.cpp
+5
View File
@@ -1651,6 +1651,7 @@ STR16 pAssignmentStrings[] =
L"游击队", //L"M.Militia", //training moving militia units //ham3.6
L"教练", // training a teammate
L"学员", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"工作", // L"Staff", // operating a strategic facility //ham3.6
L"饮食", // eating at a facility (cantina etc.)
L"休息", //L"Rest",// Resting at a facility //ham3.6
@@ -1737,6 +1738,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"训练游击队",
L"教练",
L"学员",
L"MoveItem", // move items // TODO.Translate
L"设施职员",
L"饮食", // eating at a facility (cantina etc.)
L"在设施里休养",
@@ -1784,6 +1786,7 @@ STR16 pLongAssignmentStrings[] =
L"训练游击队", //L"Train Mobiles",
L"训练队友",
L"学员",
L"MoveItem", // move items // TODO.Translate
L"设施职员", //L"Staff Facility",
L"休息", //L"Rest at Facility",
L"审讯俘虏", // L"Interrogate prisoners",
@@ -1908,6 +1911,7 @@ STR16 pAssignMenuStrings[] =
L"交通工具",
L"修理",
L"训练",
L"MoveItem", // move items // TODO.Translate
L"设施", // L"Facility", // the merc is using/staffing a facility //ham3.6
L"取消",
};
@@ -3254,6 +3258,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: 切换是否显示套装包\n|R|i|g|h|t |C|l|i|c|k: 只显示套装包", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: 切换是否显示杂项物品\n|R|i|g|h|t |C|l|i|c|k: 只显示杂项物品", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_DutchText.cpp
+5
View File
@@ -1647,6 +1647,7 @@ STR16 pAssignmentStrings[] =
L"M.Militia", //training moving militia units // TODO.Translate
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Staff", // operating a strategic facility // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Rest", // Resting at a facility // TODO.Translate
@@ -1733,6 +1734,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // TODO.Translate
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Facility Staff", // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Resting at Facility", // TODO.Translate
@@ -1780,6 +1782,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // TODO.Translate
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Staff Facility", // TODO.Translate
L"Rest at Facility", // TODO.Translate
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -1904,6 +1907,7 @@ STR16 pAssignMenuStrings[] =
L"Vehicle", // the merc is in a vehicle
L"Repair", // the merc is repairing items
L"Train", // the merc is training
L"MoveItem", // move items // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Stop", // cancel this menu
};
@@ -3254,6 +3258,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_EnglishText.cpp
+5
View File
@@ -1651,6 +1651,7 @@ STR16 pAssignmentStrings[] =
L"M.Militia", //training moving militia units
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"MoveItem", // move items
L"Staff", // operating a strategic facility
L"Eat", // eating at a facility (cantina etc.)
L"Rest", // Resting at a facility
@@ -1737,6 +1738,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // Missing
L"Trainer",
L"Student",
L"MoveItem", // move items
L"Facility Staff", // Missing
L"Eat", // eating at a facility (cantina etc.)
L"Resting at Facility", // Missing
@@ -1784,6 +1786,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // Missing
L"Train Teammate",
L"Student",
L"MoveItem", // move items
L"Staff Facility", // Missing
L"Rest at Facility", // Missing
L"Interrogate prisoners", // Flugente: interrogate prisoners
@@ -1908,6 +1911,7 @@ STR16 pAssignMenuStrings[] =
L"Vehicle", // the merc is in a vehicle
L"Repair", // the merc is repairing items
L"Train", // the merc is training
L"MoveItem", // move items
L"Facility", // the merc is using/staffing a facility
L"Cancel", // cancel this menu
};
@@ -3254,6 +3258,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_FrenchText.cpp
+5
View File
@@ -1655,6 +1655,7 @@ STR16 pAssignmentStrings[] =
L"Milice M.", //training moving militia units
L"Entraîneur", // training a teammate //!!! Too long ? (11 char) -> 11 chars is OK
L"Élève", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Exploitation", // operating a strategic facility
L"Mange", // eating at a facility (cantina etc.) // TODO.Translate
L"Repos", // Resting at a facility
@@ -1741,6 +1742,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Forme la milice mobile",//!!! Too long ? -> It is OK
L"Entraîneur",
L"Élève",
L"MoveItem", // move items // TODO.Translate
L"Exploitation infras.", //!!! Idem ? -> The current translation is OK
L"Manger", // eating at a facility (cantina etc.)
L"Repos infras.",
@@ -1788,6 +1790,7 @@ STR16 pLongAssignmentStrings[] =
L"Milice mobile",
L"Entraîneur",
L"Elève",
L"MoveItem", // move items // TODO.Translate
L"Exploitation infras.", //!!! Idem ? -> Current translation is OK
L"Repos infras.",
L"Interrogate prisoners", // Flugente: interrogate prisoners // TODO.Translate
@@ -1912,6 +1915,7 @@ STR16 pAssignMenuStrings[] =
L"Transport", // the merc is in a vehicle
L"Réparation", // the merc is repairing items
L"Formation", // the merc is training
L"MoveItem", // move items // TODO.Translate
L"Construction", // the merc is using/staffing a facility
L"Annuler", // cancel this menu
};
@@ -3261,6 +3265,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_GermanText.cpp
+5
View File
@@ -1660,6 +1660,7 @@ STR16 pAssignmentStrings[] =
L"M.Miliz", //training moving militia units
L"Trainer", // training a teammate
L"Rekrut", // being trained by someone else
L"Umzug", // move items // TODO.Translate
L"Betrieb", // operating a strategic facility
L"Essen", // eating at a facility (cantina etc.)
L"Pause", // Resting at a facility
@@ -1742,6 +1743,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Trainiere Mobile Miliz",
L"Trainer",
L"Rekrut",
L"Umzug/ move items
L"Betriebspersonal",
L"Essen", // eating at a facility (cantina etc.)
L"Betriebspause",
@@ -1787,6 +1789,7 @@ STR16 pLongAssignmentStrings[] =
L"Trainiere Mobile",
L"Trainer",
L"Rekrut",
L"MoveItem", // move items
L"Betriebspersonal",
L"Betriebspause",
L"Gefangene verhören", // Flugente: interrogate prisoners
@@ -1907,6 +1910,7 @@ STR16 pAssignMenuStrings[] =
L"Fahrzeug", // the merc is in a vehicle
L"Repar.", // the merc is repairing items
L"Training", // the merc is training
L"Umzug", // move items
L"Betrieb", // the merc is using/staffing a facility
L"Abbrechen", // cancel this menu
};
@@ -3241,6 +3245,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|i|n|k|e|r |K|l|i|c|k: Ein-/Ausblenden von Ausrüstung\n|R|e|c|h|t|e|r |K|l|i|c|k: Nur Ausrüstung anzeigen", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|i|n|k|e|r |K|l|i|c|k: Ein-/Ausblenden von anderen Gegenständen\n|R|e|c|h|t|e|r |K|l|i|c|k: Nur andere Gegenstände anzeigen", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_ItalianText.cpp
+6 -1
View File
@@ -1642,7 +1642,8 @@ STR16 pAssignmentStrings[] =
L"Esercit.", // training a town to revolt
L"M.Militia", //training moving militia units // TODO.Translate
L"Istrutt.", // training a teammate
L"Studente", // being trained by someone else
L"Studente", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Staff", // operating a strategic facility // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Rest", // Resting at a facility // TODO.Translate
@@ -1729,6 +1730,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // TODO.Translate
L"Allenatore",
L"Studente",
L"MoveItem", // move items // TODO.Translate
L"Facility Staff", // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Resting at Facility", // TODO.Translate
@@ -1776,6 +1778,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // TODO.Translate
L"Allena squadra",
L"Studente",
L"MoveItem", // move items // TODO.Translate
L"Staff Facility", // TODO.Translate
L"Rest at Facility", // TODO.Translate
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -1900,6 +1903,7 @@ STR16 pAssignMenuStrings[] =
L"Veicolo", // the merc is in a vehicle
L"Ripara", // the merc is repairing items
L"Si esercita", // the merc is training
L"MoveItem", // move items // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Annulla", // cancel this menu
};
@@ -3248,6 +3252,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_PolishText.cpp
+5
View File
@@ -1659,6 +1659,7 @@ STR16 pAssignmentStrings[] =
L"R.Samoobr.", //training moving militia units
L"Instruk.", // training a teammate
L"Uczeń", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Staff", // operating a strategic facility // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Rest", // Resting at a facility // TODO.Translate
@@ -1745,6 +1746,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // TODO.Translate
L"Instruktor",
L"Uczeń",
L"MoveItem", // move items // TODO.Translate
L"Facility Staff", // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Resting at Facility", // TODO.Translate
@@ -1792,6 +1794,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // TODO.Translate
L"Trenuj oddział",
L"Uczeń",
L"MoveItem", // move items // TODO.Translate
L"Staff Facility", // TODO.Translate
L"Rest at Facility", // TODO.Translate
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -1916,6 +1919,7 @@ STR16 pAssignMenuStrings[] =
L"Pojazd", // the merc is in a vehicle
L"Naprawa", // the merc is repairing items
L"Szkolenie", // the merc is training
L"MoveItem", // move items // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Anuluj", // cancel this menu
};
@@ -3264,6 +3268,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_RussianText.cpp
+6 -1
View File
@@ -1650,7 +1650,8 @@ STR16 pAssignmentStrings[] =
L"Ополчение", // training a town to revolt
L"Мобил.гр.", //training moving militia units //M.Militia
L"Тренер", // training a teammate
L"Ученик", // being trained by someone else
L"Ученик", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Штат", // operating a strategic facility //Staff
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Отдых", // Resting at a facility //Rest
@@ -1737,6 +1738,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Тренирует мобильную группу", //Training Mobile Militia
L"Тренер",
L"Ученик",
L"MoveItem", // move items // TODO.Translate
L"Работает с населением", //Facility Staff
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Отдыхает", //Resting at Facility
@@ -1784,6 +1786,7 @@ STR16 pLongAssignmentStrings[] =
L"Тренирует мобильную группу", //Train Mobiles
L"Тренирует",
L"Обучается",
L"MoveItem", // move items // TODO.Translate
L"Работает с населением", //Staff Facility
L"Отдыхает в заведении", //Resting at Facility
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -1908,6 +1911,7 @@ STR16 pAssignMenuStrings[] =
L"Машина", // the merc is in a vehicle
L"Ремонт", // the merc is repairing items
L"Обучение", // the merc is training
L"MoveItem", // move items // TODO.Translate
L"Удобства", // the merc is using/staffing a facility //Facility
L"Отмена", // cancel this menu
};
@@ -3253,6 +3257,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Скрыть наборы\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Показать наборы", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Скрыть прочие предметы\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Показать прочие предметы", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_TaiwaneseText.cpp
+5
View File
@@ -1651,6 +1651,7 @@ STR16 pAssignmentStrings[] =
L"M.Militia", //training moving militia units // TODO.Translate
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"MoveItem", // move items // TODO.Translate
L"Staff", // operating a strategic facility // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Rest", // Resting at a facility // TODO.Translate
@@ -1737,6 +1738,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // TODO.Translate
L"Trainer",
L"Student",
L"MoveItem", // move items // TODO.Translate
L"Facility Staff", // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Resting at Facility", // TODO.Translate
@@ -1784,6 +1786,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // TODO.Translate
L"Train Teammate",
L"Student",
L"MoveItem", // move items // TODO.Translate
L"Staff Facility", // TODO.Translate
L"Rest at Facility", // TODO.Translate
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -1908,6 +1911,7 @@ STR16 pAssignMenuStrings[] =
L"Vehicle", // the merc is in a vehicle
L"Repair", // the merc is repairing items
L"Train", // the merc is training
L"MoveItem", // move items // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Cancel", // cancel this menu
};
@@ -3258,6 +3262,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =