Add transtlation markers for help messages

Change-Id: I20a487952b8c4e4cc74a69e731e84672daff22e4
Partial-Bug: #1269930
Add transtlation markers for error messages

Change-Id: Ic44073880b7e65b6530a7314a5a2d65eb4aadb09
Partial-Bug: #1269930
Merge "Add transtlation markers for help messages"
Merge "Add transtlation markers for error messages"