Update strings.xml
Update strings.xml
Update strings.xml
Update strings.xml
Added option to merge template with reset
Merge pull request #1908 from danielmmmm/master

Updated Norwegian translation
Updated changelog
merge