diff --git a/create_potfiles_in.py b/create_potfiles_in.py
new file mode 100644
index 000000000..6ccb39e1d
--- /dev/null
+++ b/create_potfiles_in.py
@@ -0,0 +1,23 @@
+import os
+
+# Paths to exclude
+EXCLUSIONS = [
+    "deluge/scripts"
+]
+
+POTFILE_IN = "deluge/i18n/POTFILES.in"
+
+print "Creating " + POTFILE_IN + " .."
+to_translate = []
+for (dirpath, dirnames, filenames) in os.walk("deluge"):
+    for filename in filenames:
+        if os.path.splitext(filename)[1] in (".py", ".glade") and dirpath not in EXCLUSIONS:
+            to_translate.append(os.path.join(dirpath, filename))
+
+f = open(POTFILE_IN, "wb")
+for line in to_translate:
+    f.write(line + "\n")
+
+f.close()
+
+print "Done"
diff --git a/deluge/i18n/POTFILES.in b/deluge/i18n/POTFILES.in
index 1d0fe4c07..eff041dce 100644
--- a/deluge/i18n/POTFILES.in
+++ b/deluge/i18n/POTFILES.in
@@ -1,139 +1,162 @@
-deluge/plugins/label/label/data/label_pref.glade
-deluge/plugins/label/label/data/label_options.glade
-deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
-deluge/plugins/stats/stats/data/config.glade
-deluge/plugins/stats/stats/data/tabs.glade
-deluge/ui/gtkui/glade/add_torrent_dialog.glade
-deluge/ui/gtkui/glade/filtertree_menu.glade
-deluge/ui/gtkui/glade/torrent_menu.glade
-deluge/ui/gtkui/glade/remove_torrent_dialog.glade
-deluge/ui/gtkui/glade/preferences_dialog.glade
-deluge/ui/gtkui/glade/edit_trackers.glade
-deluge/ui/gtkui/glade/queuedtorrents.glade
-deluge/ui/gtkui/glade/move_storage_dialog.glade
-deluge/ui/gtkui/glade/connection_manager.glade
-deluge/ui/gtkui/glade/create_torrent_dialog.glade
-deluge/ui/gtkui/glade/dgtkpopups.glade
-deluge/ui/gtkui/glade/tray_menu.glade
-deluge/ui/gtkui/glade/main_window.glade
+deluge/error.py
+deluge/maketorrent.py
+deluge/common.py
+deluge/rencode.py
+deluge/httpdownloader.py
+deluge/main.py
+deluge/configmanager.py
 deluge/bencode.py
-docs/source/conf.py
-deluge/core/autoadd.py
-deluge/core/preferencesmanager.py
-deluge/core/filtermanager.py
-deluge/core/torrentmanager.py
-deluge/core/daemon.py
-deluge/core/torrent.py
-deluge/core/pluginmanager.py
-deluge/core/oldstateupgrader.py
-deluge/core/__init__.py
-deluge/core/core.py
-deluge/core/alertmanager.py
-deluge/core/rpcserver.py
-deluge/config.py
-deluge/countries.py
-deluge/metafile.py
+deluge/__rpcapi.py
 deluge/pluginmanagerbase.py
-deluge/plugins/label/label/webui.py
-deluge/plugins/label/label/test.py
-deluge/plugins/label/label/gtkui/label_config.py
-deluge/plugins/label/label/gtkui/sidebar_menu.py
-deluge/plugins/label/label/gtkui/submenu.py
-deluge/plugins/label/label/gtkui/__init__.py
-deluge/plugins/label/label/__init__.py
-deluge/plugins/label/label/core.py
-deluge/plugins/label/setup.py
+deluge/metafile.py
+deluge/event.py
+deluge/__init__.py
+deluge/_libtorrent.py
+deluge/log.py
+deluge/component.py
+deluge/config.py
 deluge/plugins/pluginbase.py
 deluge/plugins/init.py
-deluge/plugins/blocklist/setup.py
-deluge/plugins/blocklist/blocklist/webui.py
-deluge/plugins/blocklist/blocklist/gtkui.py
-deluge/plugins/blocklist/blocklist/text.py
-deluge/plugins/blocklist/blocklist/peerguardian.py
-deluge/plugins/blocklist/blocklist/__init__.py
-deluge/plugins/blocklist/blocklist/core.py
 deluge/plugins/__init__.py
-deluge/plugins/webuipluginbase.py
-deluge/plugins/stats/setup.py
-deluge/plugins/stats/stats/webui.py
-deluge/plugins/stats/stats/gtkui.py
-deluge/plugins/stats/stats/test.py
-deluge/plugins/stats/stats/graph.py
-deluge/plugins/stats/stats/test_total.py
-deluge/plugins/stats/stats/__init__.py
-deluge/plugins/stats/stats/core.py
-deluge/configmanager.py
+deluge/plugins/execute/setup.py
+deluge/plugins/execute/execute/common.py
+deluge/plugins/execute/execute/core.py
+deluge/plugins/execute/execute/gtkui.py
+deluge/plugins/execute/execute/__init__.py
+deluge/plugins/execute/execute/webui.py
+deluge/plugins/execute/execute/data/execute_prefs.glade
+deluge/plugins/extractor/setup.py
+deluge/plugins/extractor/extractor/common.py
+deluge/plugins/extractor/extractor/core.py
+deluge/plugins/extractor/extractor/gtkui.py
+deluge/plugins/extractor/extractor/__init__.py
+deluge/plugins/extractor/extractor/webui.py
+deluge/plugins/extractor/extractor/data/extractor_prefs.glade
+deluge/plugins/webui/setup.py
+deluge/plugins/webui/webui/common.py
+deluge/plugins/webui/webui/core.py
+deluge/plugins/webui/webui/gtkui.py
+deluge/plugins/webui/webui/__init__.py
+deluge/plugins/webui/webui/data/config.glade
+deluge/plugins/scheduler/setup.py
+deluge/plugins/scheduler/scheduler/common.py
+deluge/plugins/scheduler/scheduler/core.py
+deluge/plugins/scheduler/scheduler/gtkui.py
+deluge/plugins/scheduler/scheduler/__init__.py
+deluge/plugins/scheduler/scheduler/webui.py
+deluge/plugins/label/setup.py
+deluge/plugins/label/label/core.py
+deluge/plugins/label/label/test.py
+deluge/plugins/label/label/__init__.py
+deluge/plugins/label/label/webui.py
+deluge/plugins/label/label/data/label_pref.glade
+deluge/plugins/label/label/data/label_options.glade
+deluge/plugins/label/label/gtkui/submenu.py
+deluge/plugins/label/label/gtkui/sidebar_menu.py
+deluge/plugins/label/label/gtkui/__init__.py
+deluge/plugins/label/label/gtkui/label_config.py
+deluge/plugins/blocklist/setup.py
+deluge/plugins/blocklist/blocklist/readers.py
+deluge/plugins/blocklist/blocklist/peerguardian.py
+deluge/plugins/blocklist/blocklist/common.py
+deluge/plugins/blocklist/blocklist/detect.py
+deluge/plugins/blocklist/blocklist/core.py
+deluge/plugins/blocklist/blocklist/decompressers.py
+deluge/plugins/blocklist/blocklist/gtkui.py
+deluge/plugins/blocklist/blocklist/__init__.py
+deluge/plugins/blocklist/blocklist/webui.py
+deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
+deluge/ui/ui.py
+deluge/ui/common.py
+deluge/ui/coreconfig.py
+deluge/ui/countries.py
 deluge/ui/tracker_icons.py
 deluge/ui/client.py
-deluge/ui/ui.py
-deluge/ui/coreconfig.py
-deluge/ui/console/colors.py
-deluge/ui/console/commands/resume.py
-deluge/ui/console/commands/config.py
-deluge/ui/console/commands/halt.py
-deluge/ui/console/commands/debug.py
-deluge/ui/console/commands/__init__.py
-deluge/ui/console/commands/quit.py
-deluge/ui/console/commands/connect.py
-deluge/ui/console/commands/pause.py
-deluge/ui/console/commands/add.py
-deluge/ui/console/commands/rm.py
-deluge/ui/console/commands/info.py
-deluge/ui/console/commands/help.py
-deluge/ui/console/main.py
-deluge/ui/console/__init__.py
-deluge/ui/gtkui/listview.py
-deluge/ui/gtkui/options_tab.py
-deluge/ui/gtkui/statusbar.py
-deluge/ui/gtkui/status_tab.py
-deluge/ui/gtkui/addtorrentdialog.py
-deluge/ui/gtkui/sidebar.py
-deluge/ui/gtkui/gtkui.py
-deluge/ui/gtkui/aboutdialog.py
-deluge/ui/gtkui/systemtray.py
-deluge/ui/gtkui/files_tab.py
-deluge/ui/gtkui/menubar.py
-deluge/ui/gtkui/peers_tab.py
-deluge/ui/gtkui/notification.py
-deluge/ui/gtkui/toolbar.py
-deluge/ui/gtkui/ipcinterface.py
-deluge/ui/gtkui/filtertreeview.py
-deluge/ui/gtkui/queuedtorrents.py
-deluge/ui/gtkui/pluginmanager.py
-deluge/ui/gtkui/mainwindow.py
-deluge/ui/gtkui/removetorrentdialog.py
-deluge/ui/gtkui/common.py
-deluge/ui/gtkui/torrentdetails.py
-deluge/ui/gtkui/__init__.py
-deluge/ui/gtkui/edittrackersdialog.py
-deluge/ui/gtkui/preferences.py
-deluge/ui/gtkui/torrentview.py
-deluge/ui/gtkui/new_release_dialog.py
-deluge/ui/gtkui/connectionmanager.py
-deluge/ui/gtkui/createtorrentdialog.py
-deluge/ui/gtkui/details_tab.py
-deluge/ui/common.py
 deluge/ui/__init__.py
-deluge/ui/web/auth.py
-deluge/ui/web/common.py
+deluge/ui/gtkui/toolbar.py
+deluge/ui/gtkui/addtorrentdialog.py
+deluge/ui/gtkui/removetorrentdialog.py
+deluge/ui/gtkui/status_tab.py
+deluge/ui/gtkui/common.py
+deluge/ui/gtkui/peers_tab.py
+deluge/ui/gtkui/connectionmanager.py
+deluge/ui/gtkui/systemtray.py
+deluge/ui/gtkui/notification.py
+deluge/ui/gtkui/new_release_dialog.py
+deluge/ui/gtkui/details_tab.py
+deluge/ui/gtkui/options_tab.py
+deluge/ui/gtkui/torrentdetails.py
+deluge/ui/gtkui/sidebar.py
+deluge/ui/gtkui/edittrackersdialog.py
+deluge/ui/gtkui/mainwindow.py
+deluge/ui/gtkui/dialogs.py
+deluge/ui/gtkui/aboutdialog.py
+deluge/ui/gtkui/listview.py
+deluge/ui/gtkui/createtorrentdialog.py
+deluge/ui/gtkui/statusbar.py
+deluge/ui/gtkui/ipcinterface.py
+deluge/ui/gtkui/gtkui.py
+deluge/ui/gtkui/torrentview.py
+deluge/ui/gtkui/queuedtorrents.py
+deluge/ui/gtkui/filtertreeview.py
+deluge/ui/gtkui/__init__.py
+deluge/ui/gtkui/menubar.py
+deluge/ui/gtkui/files_tab.py
+deluge/ui/gtkui/preferences.py
+deluge/ui/gtkui/pluginmanager.py
+deluge/ui/gtkui/glade/main_window.glade
+deluge/ui/gtkui/glade/remove_torrent_dialog.glade
+deluge/ui/gtkui/glade/create_torrent_dialog.glade
+deluge/ui/gtkui/glade/torrent_menu.glade
+deluge/ui/gtkui/glade/edit_trackers.glade
+deluge/ui/gtkui/glade/filtertree_menu.glade
+deluge/ui/gtkui/glade/tray_menu.glade
+deluge/ui/gtkui/glade/dgtkpopups.glade
+deluge/ui/gtkui/glade/move_storage_dialog.glade
+deluge/ui/gtkui/glade/connection_manager.glade
+deluge/ui/gtkui/glade/queuedtorrents.glade
+deluge/ui/gtkui/glade/add_torrent_dialog.glade
+deluge/ui/gtkui/glade/preferences_dialog.glade
 deluge/ui/web/gen_gettext.py
+deluge/ui/web/web.py
+deluge/ui/web/common.py
+deluge/ui/web/auth.py
+deluge/ui/web/server.py
 deluge/ui/web/__init__.py
 deluge/ui/web/json_api.py
 deluge/ui/web/pluginmanager.py
-deluge/ui/web/server.py
-deluge/ui/web/web.py
-deluge/common.py
-deluge/component.py
-deluge/main.py
-deluge/error.py
-deluge/__init__.py
-deluge/tests/test_signalreceiver.py
-deluge/tests/test_filters.py
-deluge/tests/test_plugin_metadata.py
-deluge/tests/test_tracker_icons.py
-deluge/tests/test_stats.py
-deluge/tests/test_client.py
-deluge/log.py
-deluge/scripts/deluge_remote.py
-deluge/scripts/wiki_docgen.py
-deluge/scripts/create_plugin.py
+deluge/ui/console/eventlog.py
+deluge/ui/console/main.py
+deluge/ui/console/statusbars.py
+deluge/ui/console/colors.py
+deluge/ui/console/__init__.py
+deluge/ui/console/screen.py
+deluge/ui/console/commands/quit.py
+deluge/ui/console/commands/help.py
+deluge/ui/console/commands/add.py
+deluge/ui/console/commands/pause.py
+deluge/ui/console/commands/resume.py
+deluge/ui/console/commands/halt.py
+deluge/ui/console/commands/recheck.py
+deluge/ui/console/commands/cache.py
+deluge/ui/console/commands/connect.py
+deluge/ui/console/commands/plugin.py
+deluge/ui/console/commands/info.py
+deluge/ui/console/commands/__init__.py
+deluge/ui/console/commands/rm.py
+deluge/ui/console/commands/config.py
+deluge/ui/console/commands/debug.py
+deluge/core/torrent.py
+deluge/core/alertmanager.py
+deluge/core/filtermanager.py
+deluge/core/authmanager.py
+deluge/core/core.py
+deluge/core/preferencesmanager.py
+deluge/core/torrentmanager.py
+deluge/core/oldstateupgrader.py
+deluge/core/__init__.py
+deluge/core/rpcserver.py
+deluge/core/daemon.py
+deluge/core/eventmanager.py
+deluge/core/pluginmanager.py
+deluge/core/autoadd.py