diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 00000000..45480db2
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,18 @@
+fdroid
+fdroidserver/btlog.py
+fdroidserver/build.py
+fdroidserver/checkupdates.py
+fdroidserver/common.py
+fdroidserver/dscanner.py
+fdroidserver/import.py
+fdroidserver/init.py
+fdroidserver/install.py
+fdroidserver/lint.py
+fdroidserver/metadata.py
+fdroidserver/publish.py
+fdroidserver/rewritemeta.py
+fdroidserver/scanner.py
+fdroidserver/server.py
+fdroidserver/stats.py
+fdroidserver/update.py
+fdroidserver/verify.py
diff --git a/po/fdroidserver.pot b/po/fdroidserver.pot
new file mode 100644
index 00000000..0c47b871
--- /dev/null
+++ b/po/fdroidserver.pot
@@ -0,0 +1,386 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-01 17:23+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../fdroid:34
+msgid "Build a package from source"
+msgstr ""
+
+#: ../fdroid:35
+msgid "Quickly start a new repository"
+msgstr ""
+
+#: ../fdroid:36
+msgid "Sign and place packages in the repo"
+msgstr ""
+
+#: ../fdroid:37
+msgid "Add gpg signatures for packages in repo"
+msgstr ""
+
+#: ../fdroid:38
+msgid "Update repo information for new packages"
+msgstr ""
+
+#: ../fdroid:39
+msgid "Verify the integrity of downloaded packages"
+msgstr ""
+
+#: ../fdroid:40
+msgid "Check for updates to applications"
+msgstr ""
+
+#: ../fdroid:41
+msgid "Add a new application from its source code"
+msgstr ""
+
+#: ../fdroid:42
+msgid "Install built packages on devices"
+msgstr ""
+
+#: ../fdroid:43
+msgid "Read all the metadata files and exit"
+msgstr ""
+
+#: ../fdroid:44
+msgid "Rewrite all the metadata files"
+msgstr ""
+
+#: ../fdroid:45
+msgid "Warn about possible metadata errors"
+msgstr ""
+
+#: ../fdroid:46
+msgid "Scan the source code of a package"
+msgstr ""
+
+#: ../fdroid:47
+msgid "Dynamically scan APKs post build"
+msgstr ""
+
+#: ../fdroid:48
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroid:49
+msgid "Interact with the repo HTTP server"
+msgstr ""
+
+#: ../fdroid:50
+msgid "Sign indexes created using update --nosign"
+msgstr ""
+
+#: ../fdroid:51
+msgid "Update the binary transparency log for a URL"
+msgstr ""
+
+#: ../fdroid:56
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid:58
+msgid "Valid commands are:"
+msgstr ""
+
+#: ../fdroid:104
+#, c-format
+msgid "Command '%s' not recognised.\n"
+msgstr ""
+
+#: ../fdroid:150
+msgid "Unknown exception found!"
+msgstr ""
+
+#: ../fdroidserver/btlog.py:154
+msgid "Path to the git repo to use as the log"
+msgstr ""
+
+#: ../fdroidserver/btlog.py:156
+msgid "The base URL for the repo to log (default: https://f-droid.org)"
+msgstr ""
+
+#: ../fdroidserver/btlog.py:158
+msgid "Push the log to this git remote repository"
+msgstr ""
+
+#: ../fdroidserver/build.py:875 ../fdroidserver/install.py:52
+#: ../fdroidserver/publish.py:45 ../fdroidserver/scanner.py:255
+#: ../fdroidserver/verify.py:41
+msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: ../fdroidserver/build.py:877
+msgid "Build only the latest version of each package"
+msgstr ""
+
+#: ../fdroidserver/build.py:879
+msgid "Make the build stop on exceptions"
+msgstr ""
+
+#: ../fdroidserver/build.py:881
+msgid ""
+"Test mode - put output in the tmp directory only, and always build, even if "
+"the output already exists."
+msgstr ""
+
+#: ../fdroidserver/build.py:883
+msgid "Use build server"
+msgstr ""
+
+#: ../fdroidserver/build.py:885
+msgid ""
+"Reset and create a brand new build server, even if the existing one appears "
+"to be ok."
+msgstr ""
+
+#: ../fdroidserver/build.py:887
+msgid "Specify that we're running on the build server"
+msgstr ""
+
+#: ../fdroidserver/build.py:889
+msgid "Skip scanning the source code for binaries and other problems"
+msgstr ""
+
+#: ../fdroidserver/build.py:891
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroidserver/build.py:893
+msgid "Don't create a source tarball, useful when testing a build"
+msgstr ""
+
+#: ../fdroidserver/build.py:895
+msgid ""
+"Don't refresh the repository, useful when testing a build with no internet "
+"connection"
+msgstr ""
+
+#: ../fdroidserver/build.py:897
+msgid ""
+"Force build of disabled apps, and carries on regardless of scan problems. "
+"Only allowed in test mode."
+msgstr ""
+
+#: ../fdroidserver/build.py:899
+msgid "Build all applications available"
+msgstr ""
+
+#: ../fdroidserver/build.py:901 ../fdroidserver/update.py:1519
+msgid "Update the wiki"
+msgstr ""
+
+#: ../fdroidserver/checkupdates.py:513
+msgid "app-id to check for updates"
+msgstr ""
+
+#: ../fdroidserver/checkupdates.py:515
+msgid "Process auto-updates"
+msgstr ""
+
+#: ../fdroidserver/checkupdates.py:517
+msgid "Only process apps with auto-updates"
+msgstr ""
+
+#: ../fdroidserver/checkupdates.py:519
+msgid "Commit changes"
+msgstr ""
+
+#: ../fdroidserver/checkupdates.py:521
+msgid "Only print differences with the Play Store"
+msgstr ""
+
+#: ../fdroidserver/common.py:124
+msgid "Spew out even more information than normal"
+msgstr ""
+
+#: ../fdroidserver/common.py:126
+msgid "Restrict output to warnings and errors"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py:410
+msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py:413
+msgid "Scan only the latest version of each package"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py:416
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py:419
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py:422
+msgid "Clean up all containers and then exit"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py:425
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py:428
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
+#: ../fdroidserver/import.py:193
+msgid "Project URL to import from."
+msgstr ""
+
+#: ../fdroidserver/import.py:195
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
+#: ../fdroidserver/import.py:197
+msgid "Comma separated list of categories."
+msgstr ""
+
+#: ../fdroidserver/import.py:199
+msgid "Overall license of the project."
+msgstr ""
+
+#: ../fdroidserver/import.py:201
+msgid ""
+"Allows a different revision (or git branch) to be specified for the initial "
+"import"
+msgstr ""
+
+#: ../fdroidserver/init.py:56
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr ""
+
+#: ../fdroidserver/init.py:58
+msgid "Path to the keystore for the repo signing key"
+msgstr ""
+
+#: ../fdroidserver/init.py:60
+msgid "Alias of the repo signing key in the keystore"
+msgstr ""
+
+#: ../fdroidserver/init.py:62
+msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
+msgstr ""
+
+#: ../fdroidserver/init.py:64
+msgid "Do not prompt for Android SDK path, just fail"
+msgstr ""
+
+#: ../fdroidserver/install.py:54
+msgid "Install all signed applications available"
+msgstr ""
+
+#: ../fdroidserver/lint.py:393
+msgid "Also warn about formatting issues, like rewritemeta -l"
+msgstr ""
+
+#: ../fdroidserver/lint.py:394 ../fdroidserver/rewritemeta.py:57
+msgid "app-id in the form APPID"
+msgstr ""
+
+#: ../fdroidserver/metadata.py:1337
+msgid "force errors to be warnings, or ignore"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py:54
+msgid "List files that would be reformatted"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py:56
+msgid "Rewrite to a specific format: "
+msgstr ""
+
+#: ../fdroidserver/server.py:547
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
+#: ../fdroidserver/server.py:549
+msgid "Specify an identity file to provide to SSH for rsyncing"
+msgstr ""
+
+#: ../fdroidserver/server.py:551
+msgid "Specify a local folder to sync the repo to"
+msgstr ""
+
+#: ../fdroidserver/server.py:553
+msgid "Don't use rsync checksums"
+msgstr ""
+
+#: ../fdroidserver/stats.py:64
+msgid "Download logs we don't have"
+msgstr ""
+
+#: ../fdroidserver/stats.py:66
+msgid "Recalculate aggregate stats - use when changes "
+msgstr ""
+
+#: ../fdroidserver/stats.py:69
+msgid "Don't do anything logs-related"
+msgstr ""
+
+#: ../fdroidserver/update.py:1504
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py:1506
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/update.py:1508
+msgid "Delete APKs and/or OBBs without metadata from the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py:1510
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/update.py:1512
+msgid "Interactively ask about things that need updating."
+msgstr ""
+
+#: ../fdroidserver/update.py:1514
+msgid "Resize all the icons exceeding the max pixel size and exit"
+msgstr ""
+
+#: ../fdroidserver/update.py:1516
+#, c-format
+msgid "Specify editor to use in interactive mode. Default %s"
+msgstr ""
+
+#: ../fdroidserver/update.py:1521
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/update.py:1523
+msgid "Clean update - don't uses caches, reprocess all apks"
+msgstr ""
+
+#: ../fdroidserver/update.py:1525
+msgid ""
+"When configured for signed indexes, create only unsigned indexes at this "
+"stage"
+msgstr ""
+
+#: ../fdroidserver/update.py:1527
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr ""
+
+#: ../fdroidserver/update.py:1529
+msgid "Rename APK files that do not match package.name_123.apk"
+msgstr ""