Merge pull request #247 from y0014984/dev

Release v0.5.1

AUTHORS.txt

@@ -10,3 +10,5 @@ y0014984
 Wasserstoff
 
 # CONTRIBUTORS
+Bilibagga (Russian translation)
+PowerBOXx (Simplified Chinese Translation)

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/y0014984/Advanced-Equipment/releases/latest">
-        <img src="https://img.shields.io/badge/Version-0.5.0-blue.svg?style=flat-square" alt="Advanced Equipment Version">
+        <img src="https://img.shields.io/badge/Version-0.5.1-blue.svg?style=flat-square" alt="Advanced Equipment Version">
     </a>
     <a href="https://www.bistudio.com/community/licenses/arma-public-license-share-alike">
         <img src="https://img.shields.io/badge/License-APL%20SA-red.svg?style=flat-square" alt="Advanced Equipment License">
@@ -27,6 +27,7 @@ This project is entirely **open-source** and all contributions are welcome. Feel
 - Network Management (only basics implemented yet)
 - Logistics (Fold and unfold objects, move them around, put them into vehicles)
 - 3DEN Modules (Easy Mission Making)
+- Localization (English, German, Russian, Simplified Chinese)
 
 ## Wiki
 See <a href="https://github.com/y0014984/Advanced-Equipment/wiki">Wiki pages</a> for additional information on how to use Advanced Equipment. 

addons/armaos/CfgFactionClasses.hpp

@@ -4,6 +4,6 @@ class CfgFactionClasses
     class NO_CATEGORY;
     class AE3_armaosModules: NO_CATEGORY
     {
-        displayName = "AE3 armaOS Modules";
+        displayName = "$STR_AE3_ArmaOS_Config_ArmaOSModulesKategoryDisplayName";
     };
 };

addons/armaos/CfgOsFunctions.hpp

@@ -13,128 +13,166 @@ class CfgOsFunctions
 	class man : OsFunction
 	{
 		path = "/bin/man";
-		description = "Prints usage information about a command.";
-		man = "Usage man: 'man [command]' returns usage information for the command.";
+		description = "$STR_AE3_ArmaOS_Config_CommandManDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandManMan";
 		code = "_this call AE3_armaos_fnc_os_man";
 	};
 
 	class help : OsFunction
 	{
 		path = "/bin/help";
-		description = "Prints all installed programs.";
-		man = "Usage help: 'help' returns a list of available programs. No options needed.";
+		description = "$STR_AE3_ArmaOS_Config_CommandHelpDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandHelpMan";
 		code = "_this call AE3_armaos_fnc_os_help";
 	};
 
 	class ls : OsFunction
 	{
 		path = "/bin/ls";
-		description = "Display the content of a directory.";
-		man = "Usage ls: 'ls [path]' returns a list of filesystem objects found in this path.";
+		description = "$STR_AE3_ArmaOS_Config_CommandLsDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandLsMan";
 		code = "_this call AE3_armaos_fnc_os_ls";
 	};
 
 	class cd : OsFunction
 	{
 		path = "/bin/cd";
-		description = "Change the working directory.";
-		man = "Usage cd: 'cd [path]' sets path as the new working directory.";
+		description = "$STR_AE3_ArmaOS_Config_CommandCdDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandCdMan";
 		code = "_this call AE3_armaos_fnc_os_cd";
 	};
 
 	class cat : OsFunction
 	{
 		path = "/bin/cat";
-		description = "Prints the content of a file.";
-		man = "Usage cat: 'cat [file]' shows the content of a file.";
+		description = "$STR_AE3_ArmaOS_Config_CommandCatDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandCatMan";
 		code = "_this call AE3_armaos_fnc_os_cat";
 	};
 
 	class date : OsFunction
 	{
 		path = "/bin/date";
-		description = "Prints the date.";
-		man = "Usage date: 'date' prints the actual date in format YYYY-MM-DD HH:MM:SS";
+		description = "$STR_AE3_ArmaOS_Config_CommandDateDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandDateMan";
 		code = "_this call AE3_armaos_fnc_os_date";
 	};
 
 	class history : OsFunction
 	{
 		path = "/bin/history";
-		description = "Prints the terminal history.";
-		man = "Usage history: 'history' lists last commands since the start of the computer.";
+		description = "$STR_AE3_ArmaOS_Config_CommandHistoryDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandHistoryMan";
 		code = "_this call AE3_armaos_fnc_os_history";
 	};
 
 	class clear : OsFunction
 	{
 		path = "/bin/clear";
-		description = "Clears the terminal history.";
-		man = "Usage clear: 'clear' deletes most of the displayed text.";
+		description = "$STR_AE3_ArmaOS_Config_CommandClearDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandClearMan";
 		code = "_this call AE3_armaos_fnc_os_clear";
 	};
 
 	class rm : OsFunction
 	{
 		path = "/bin/rm";
-		description = "Removes a file.";
-		man = "Usage rm: 'rm [path]' deletes a file at the given path.";
+		description = "$STR_AE3_ArmaOS_Config_CommandRmDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandRmMan";
 		code = "_this call AE3_armaos_fnc_os_rm";
 	};
 
 	class mv : OsFunction
 	{
 		path = "/bin/mv";
-		description = "Moves a file or folder.";
-		man = "Usage mv: 'mv [old path] [new path]' moves file to new path or renames the file.";
+		description = "$STR_AE3_ArmaOS_Config_CommandMvDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandMvMan";
 		code = "_this call AE3_armaos_fnc_os_mv";
 	};
 
 	class whoami : OsFunction
 	{
 		path = "/bin/whoami";
-		description = "Retuns the current user.";
-		man = "Usage whoami: 'whoami' returns the current user.";
+		description = "$STR_AE3_ArmaOS_Config_CommandWhoamiDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandWhoamiMan";
 		code = "_this call AE3_armaos_fnc_os_whoami";
 	};
 
+	class mkdir : OsFunction
+	{
+		path = "/bin/mkdir";
+		description = "$STR_AE3_ArmaOS_Config_CommandMkdirDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandMkdirMan";
+		code = "_this call AE3_armaos_fnc_os_mkdir";
+	};
+
 	class ping : OsFunction
 	{
 		path = "/sbin/ping";
-		description = "Pings the given address.";
-		man = "Usage ping: 'ping' pings the given address.";
+		description = "$STR_AE3_ArmaOS_Config_CommandPingDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandPingMan";
 		code = "_this call AE3_armaos_fnc_os_ping";
 	};
 
 	class ipconfig : OsFunction
 	{
 		path = "/sbin/ipconfig";
-		description = "Returns the current ip configuration.";
-		man = "Usage ipconfig: 'ipconfig' returns the current ip configuration.";
+		description = "$STR_AE3_ArmaOS_Config_CommandIpconfigDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandIpconfigMan";
 		code = "_this call AE3_armaos_fnc_os_ipconfig";
 	};
 
 	class exit : OsFunction
 	{
 		path = "/sbin/exit";
-		description = "Log out of the user session.";
-		man = "Usage exit: 'exit' brings you back to login screen.";
+		description = "$STR_AE3_ArmaOS_Config_CommandExitDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandExitMan";
 		code = "_this call AE3_armaos_fnc_os_exit";
 	};
 
 	class shutdown : OsFunction
 	{
 		path = "/sbin/shutdown";
-		description = "Shuts down the computer.";
-		man = "Usage shutdown: 'shutdown' turns off the computer.";
+		description = "$STR_AE3_ArmaOS_Config_CommandShutdownDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandShutdownMan";
 		code = "_this call AE3_armaos_fnc_os_shutdown";
 	};
 
 	class standby : OsFunction
 	{
 		path = "/sbin/standby";
-		description = "Puts the computer in standby mode.";
-		man = "Usage standby: 'standby' activates the computers standby mode.";
+		description = "$STR_AE3_ArmaOS_Config_CommandStandbyDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandStandbyMan";
 		code = "_this call AE3_armaos_fnc_os_standby";
 	};
+
+	class echo : OsFunction
+	{
+		path = "/bin/echo";
+		description = "$STR_AE3_ArmaOS_Config_CommandEchoDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandEchoMan";
+		code = "_this call AE3_armaos_fnc_os_echo";
+	};
+
+	class crypto : OsFunction
+	{
+		path = "/bin/crypto";
+		description = "$STR_AE3_ArmaOS_Config_CommandCryptoDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandCryptoMan";
+		code = "_this call AE3_armaos_fnc_os_crypto";
+	};
+	class crack : OsFunction
+	{
+		path = "/bin/crack";
+		description = "$STR_AE3_ArmaOS_Config_CommandCrackDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandCrackMan";
+		code = "_this call AE3_armaos_fnc_os_crack";
+	};
+	class find : OsFunction
+	{
+		path = "/bin/find";
+		description = "$STR_AE3_ArmaOS_Config_CommandFindDescr";
+		man = "$STR_AE3_ArmaOS_Config_CommandFindMan";
+		code = "_this call AE3_armaos_fnc_os_find";
+	};
 };

addons/armaos/CfgVehicles.hpp

@@ -10,20 +10,20 @@ class CfgVehicles
 			class Black
 			{
 				author = "Bohemia Interactive";
-				displayName = "Black";
+				displayName = "$STR_AE3_ArmaOS_Config_TextureBlack";
 				factions[] = {};
 				textures[] = {"a3\Props_F_Enoch\Military\Equipment\data\Laptop_03_black_CO.paa"};
 			};
 			class Olive
 			{
 				author = "Bohemia Interactive";
-				displayName = "Olive";
+				displayName = "$STR_AE3_ArmaOS_Config_TextureOlive";
 				factions[] = {};
 				textures[] = {"a3\Props_F_Enoch\Military\Equipment\data\Laptop_03_olive_CO.paa"};
 			};
 			class Sand
 			{
-				displayName = "Sand";
+				displayName = "$STR_AE3_ArmaOS_Config_TextureSand";
 				author = "Bohemia Interactive";
 				factions[] = {};
 				textures[] = {"a3\Props_F_Enoch\Military\Equipment\data\Laptop_03_sand_CO.paa"};
@@ -102,9 +102,9 @@ class CfgVehicles
 
 		class AE3_Equipment
 		{
-			displayName = "Laptop";
+			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";
 
-			closeState = 1;
+			closeState = 0;
 
 			init = "_this call AE3_interaction_fnc_initLaptop;";
 
@@ -116,7 +116,7 @@ class CfgVehicles
 
 		class AE3_Device
 		{
-			displayName = "Laptop";
+			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";
 			defaultPowerLevel = 0;
 
 			init = "_this call AE3_filesystem_fnc_initFilesystem; _this call AE3_armaos_fnc_link_init; _this call AE3_network_fnc_initNetworkDevice;";
@@ -137,7 +137,7 @@ class CfgVehicles
 
 		class AE3_InternalDevice
 		{
-			displayName = "Battery";
+			displayName = "$STR_AE3_ArmaOS_Config_BatteryDisplayName";
 			defaultPowerLevel = 1;
 
 			turnOnAction = "_this + [true] call AE3_power_fnc_turnOnBatteryAction";
@@ -162,16 +162,16 @@ class CfgVehicles
 		{
 			class ACE_MainActions
 			{
-				displayName = "Interaktionen";
+				displayName = "$STR_ACE_Interaction_MainAction";
 				condition = "true";
 				distance = 2;
 				class AE3_Laptop_Group
 				{
-					displayName = "ArmaOS";
+					displayName = "$STR_AE3_ArmaOS_Config_ArmaOSDisplayName";
 					condition = "true";
 					class AE3_UseComputer
 					{
-						displayName = "Use";
+						displayName = "$STR_AE3_ArmaOS_Config_UseDisplayName";
 						condition = "(alive _target) && (_target getVariable 'AE3_power_powerState' == 1) && (isNull (_target getVariable ['AE3_computer_mutex', objNull]))";
 						statement = "params ['_target', '_player', '_params']; _target setVariable ['AE3_computer_mutex', _player, true]; _handle = [_target] spawn AE3_armaos_fnc_terminal_init;";
 						//icon = "\z\dance.paa";
@@ -210,7 +210,7 @@ class CfgVehicles
 	{
 		// Standard object definitions
 		scope = 2; // Editor visibility; 2 will show it in the menu, 1 will hide it.
-		displayName = "AE3 Add User"; // Name displayed in the menu
+		displayName = "$STR_AE3_ArmaOS_Config_AddUserDisplayName"; // Name displayed in the menu
 		icon = "\z\ae3\addons\armaos\ui\AE3_Module_Icons_addUser.paa"; // Map icon. Delete this entry to use the default icon
 		category = "AE3_armaosModules";
 
@@ -237,8 +237,8 @@ class CfgVehicles
 			class AE3_ModuleUserlist_User: Edit
 			{
 				property = "AE3_ModuleUserlist_User1";
-				displayName = "Username";
-				tooltip = "Name of authorized user, for example 'admin', 'guest' or 'stavros'";
+				displayName = "$STR_AE3_ArmaOS_Config_UsernameDisplayName";
+				tooltip = "$STR_AE3_ArmaOS_Config_UsernameTooltip";
 				typeName = "STRING"; // Value type, can be "NUMBER", "STRING" or "BOOL"
 				// Default text filled in the input box
 				// Because it is an expression, to return a String one must have a string within a string
@@ -247,8 +247,8 @@ class CfgVehicles
 			class AE3_ModuleUserlist_Password: Edit
 			{
 				property = "AE3_ModuleUserlist_Password1";
-				displayName = "Password";
-				tooltip = "Password of authorized user, for example '123456', 'password' or 'Qf5&xxR12#fTG'";
+				displayName = "$STR_AE3_ArmaOS_Config_PasswordDisplayName";
+				tooltip = "$STR_AE3_ArmaOS_Config_PasswordTooltip";
 				typeName = "STRING"; // Value type, can be "NUMBER", "STRING" or "BOOL"
 				// Default text filled in the input box
 				// Because it is an expression, to return a String one must have a string within a string
@@ -260,7 +260,7 @@ class CfgVehicles
 		// Module description. Must inherit from base class, otherwise pre-defined entities won't be available
 		class ModuleDescription: ModuleDescription
 		{
-			description = "This module defines users for an armaOS computer. Simply sync one or more of these modules to a supported computer."; // Short description, will be formatted as structured text
+			description = "$STR_AE3_ArmaOS_Config_ModuleAddUserDescription"; // Short description, will be formatted as structured text
 			sync[] = { "Land_Laptop_03_sand_F_AE3" }; // LocationArea_F // Array of synced entities (can contain base classes)
 
 			class Land_Laptop_03_sand_F_AE3