Merge branch 'master' into history
[potlatch2.git] / l10n / locale / en_GB /
drwxr-xr-x   ..
-rw-r--r-- 141 help_dialog.properties
-rw-r--r-- 2000 p2_main.properties