Merge branch 'master' into history
[potlatch2.git] / l10n / locale / nn_NO /
drwxr-xr-x   ..
-rw-r--r-- 146 help_dialog.properties
-rw-r--r-- 2103 p2_main.properties