Use the WP.org POT with no changes
Use a unique ID for our settings
Merge branch 'trunk'