NR-964 : Template inrenationalization strings
Merge remote-tracking branch 'sourcefabric/aap' into aap
Merge pull request #125 from gizm0bill/aap

NR-964 : Template inrenationalization strings