diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index dc5bb9d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: python
-python:
-    - "3.2"
-## command to install dependencies
-#install: pip install -r requirements.txt --use-mirrors
-## command to run tests
-#script: nosetests
diff --git a/INSTALL.py b/INSTALL.py
index 3bb176a..68f18bf 100755
--- a/INSTALL.py
+++ b/INSTALL.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python3
-# PKGBUILDer
+# -*- encoding: utf-8 -*-
+# PKGBUILDer installer
 # Copyright (C) 2011, Kwpolska
 # All rights reserved.
 #
@@ -34,7 +35,7 @@
 # There are no install instructions.  If you want to install
 # the script, run this script with python.
 
-"""PKGBUILDer AUR installer.  Use it if you don’t have any AUR helpers installed."""
+"""PKGBUILDer AUR installer.  Use it if you don't have any AUR helpers installed."""
 
 import subprocess
 import os
@@ -67,23 +68,65 @@
         os.mkdir(PATH)
     os.chdir(PATH)
 
-
-    PKGDATA = json.loads(urllib.request.urlopen('http://aur.archlinux.org\
-/rpc.php?type=info&arg=pkgbuilder').read().decode())
-    RHANDLE = urllib.request.urlopen('http://aur.archlinux.org'+
-    PKGDATA['results']['URLPath'])
-    open('pkgbuilder.tar.gz', 'wb').write(RHANDLE.read())
-    THANDLE = tarfile.open('pkgbuilder.tar.gz', 'r:gz')
-    THANDLE.extractall()
-    os.chdir('./pkgbuilder/')
-
-    ASROOT = ''
-    if os.geteuid() == 0:
-        ASROOT = ' --asroot'
-    MPKG = subprocess.call('/usr/bin/makepkg -si'+ASROOT, shell=True)
-
-    if MPKG == 1:
-        print(_("""
+    # Dependency check.
+
+    print(_("""Performing a dependency check..."""))
+
+    deps = {'pyparsing': None, 'pyalpm': None, 'certifi': None, 'requests': None}
+
+    print("""pyparsing | community | """, end='')
+    try:
+        import pyparsing
+        deps['pyparsing'] = True
+        print(_('found'))
+    except ImportError:
+        deps['pyparsing'] = False
+        print(_('not found'))
+
+    print("""pyalpm    | extra     | """, end='')
+    try:
+        import pyalpm
+        deps['pyalpm'] = True
+        print(_('found'))
+    except ImportError:
+        deps['pyalpm'] = False
+        print(_('not found'))
+
+    print("""certifi   | AUR       | """, end='')
+    try:
+        import certifi
+        deps['certifi'] = True
+        print(_('found'))
+    except ImportError:
+        deps['certifi'] = False
+        print(_('not found'))
+
+    print("""requests  | AUR       | """, end='')
+    try:
+        import requests
+        deps['requests'] = True
+        print(_('found'))
+    except ImportError:
+        deps['requests'] = False
+        print(_('not found'))
+
+    def install(pkgname):
+        PKGDATA = json.loads(urllib.request.urlopen('http://aur.archlinux\
+.org/rpc.php?type=info&arg='+pkgname).read().decode())
+        RHANDLE = urllib.request.urlopen('http://aur.archlinux.org'+
+        PKGDATA['results']['URLPath'])
+        open(pkgname+'.tar.gz', 'wb').write(RHANDLE.read())
+        THANDLE = tarfile.open(pkgname+'.tar.gz', 'r:gz')
+        THANDLE.extractall()
+        os.chdir('./'+pkgname+'/')
+
+        ASROOT = ''
+        if os.geteuid() == 0:
+            ASROOT = ' --asroot'
+        MPKG = subprocess.call('/usr/bin/makepkg -si'+ASROOT, shell=True)
+
+        if MPKG == 1:
+            print(_("""
 
 Something went wrong.  Please read makepkg's output and try again.
 You can also try to debug the work of this script yourself.
@@ -94,6 +137,16 @@
 If I am wrong, though, congratulations!
 """).format(PATH))
 
+    if deps['certifi'] == False or deps['requests'] == False:
+        print(_("""Installing missing AUR dependencies..."""))
+        if deps['certifi'] == False:
+            install('python-certifi')
+
+        if deps['requests'] == False:
+            install('python-requests')
+
+    install('pkgbuilder')
+
     print(_("""
 
 Read the above output.  If the script had any problems, run it
diff --git a/MANIFEST b/MANIFEST
index 6264c49..f1aa41c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -5,6 +5,7 @@ README
 README.rst
 pkgbuilder.py
 setup.py
+docs/CHANGELOG.rst
 docs/LICENSE.rst
 docs/README.rst
 docs/classes.rst
diff --git a/PKGBUILD b/PKGBUILD
index c6bd155..6df0375 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ license=('BSD')
 depends=('python' 'pyalpm>=0.5.1-1' 'python-pyparsing' 'python-requests')
 options=(!emptydirs)
 source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a39276443eb7351056f9e4708b5c4540')
+md5sums=('c5c1a6aae0d39b63df181bc617599173')
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/Rakefile b/Rakefile
index a7e2508..10effe6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ task :help do
     puts "  docshtml  Creates the docs in HTML."
     puts "  docszip   Zips the docs made by docshtml."
     puts "  git       Pushes the changes to GitHub."
-
+    puts "  locale    Prepares for translation."
 end
 
 task :prepare, :ver do |t, args|
@@ -105,6 +105,10 @@ task :git, :ver, :msg do |t, args|
     sh "git push --tags"
 end
 
+task :locale do
+    sh "xgettext -c pkgbuilder.py INSTALL.py"
+end
+
 task :update, :ver do |t, args|
     if args[:ver].to_s.chomp == ''
         puts "Version number?"
diff --git a/dist/pkgbuilder-2.1.2.31.tar.gz b/dist/pkgbuilder-2.1.2.31.tar.gz
new file mode 100644
index 0000000..cad6c80
Binary files /dev/null and b/dist/pkgbuilder-2.1.2.31.tar.gz differ
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
new file mode 100644
index 0000000..c47bfdc
--- /dev/null
+++ b/docs/CHANGELOG.rst
@@ -0,0 +1,32 @@
+=====================
+Appendix C. Changelog
+=====================
+:Info: This is a partial changelog for PKGBUILDer.
+:Author: Kwpolska <kwpolska@kwpolska.tk>
+:Date: 2012-07-27
+:Version: 2.1.2.31
+
+Versioning scheme
+=================
+PKGBUILDer uses the following versioning scheme:
+
+    generation.major.minor.revision
+
+ * generation: 1 is the first Perl version, 2 is the Python version.
+ * major: basic release number.
+ * minor: sub-release number.
+ * revision: changes that aren’t important enough to be new major versions.
+
+Generation 2
+============
+:2.1.3.0: Planned after 2.1.2.31; contains test suite, requests and file division.
+:2.1.2.0: Support for the new pyalpm.
+:2.1.1.0: Introducing the Upgrade functionality.
+:2.1.0.0: First OOP-based release.
+:2.0.0.0: First release.
+
+Generation 1
+============
+
+:1.1: A more advanced version, never released.
+:1.0: First and only release.
diff --git a/docs/pkgbuilder.8 b/docs/pkgbuilder.8
deleted file mode 100644
index e69de29..0000000
diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz
index f975e9b..3a94f61 100644
Binary files a/docs/pkgbuilder.8.gz and b/docs/pkgbuilder.8.gz differ
diff --git a/locale/en/LC_MESSAGES/pkgbuilder.mo b/locale/en/LC_MESSAGES/pkgbuilder.mo
index 048446a..ad50612 100644
Binary files a/locale/en/LC_MESSAGES/pkgbuilder.mo and b/locale/en/LC_MESSAGES/pkgbuilder.mo differ
diff --git a/locale/en/LC_MESSAGES/pkgbuilder.po b/locale/en/LC_MESSAGES/pkgbuilder.po
index 9d55fa9..d8c822c 100644
--- a/locale/en/LC_MESSAGES/pkgbuilder.po
+++ b/locale/en/LC_MESSAGES/pkgbuilder.po
@@ -1,203 +1,227 @@
 # PKGBUILDer pot file.
-# Copyright (C) 2011 Kwpolska.
-# Kwpolska <kwpolska@kwpolska.tk>, 2011.
+# Copyright (C) 2011-2012, Kwpolska.
+# This file is distributed under the same license as the PKGBUILDer package.
+# Kwpolska <kwpolska@kwpolska.tk>, 2011-2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.1.4\n"
+"Project-Id-Version: 2.1.2.31\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-22 10:17+0100\n"
-"PO-Revision-Date: 2011-10-22 10:17+0100\n"
+"POT-Creation-Date: 2011-10-22 10:16+0100\n"
+"PO-Revision-Date: 2012-07-27 13:44+0100\n"
 "Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
-"Language-Team: \n"
-"Language: \n"
+"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-Basepath: /home/kwpolska/git/pkgbuilder\n"
-"X-Poedit-SearchPath-0: /home/kwpolska/git/pkgbuilder\n"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:88
-msgid "[ERR5001] Aborted by user! Exiting..."
-msgstr "[ERR5001] Aborted by user! Exiting..."
+#: pkgbuilder.py:90
+msgid "[ERR5001] Aborted by user! Exiting…"
+msgstr "[ERR5001] Aborted by user! Exiting…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:181
+#: pkgbuilder.py:183
 msgid "WARNING:"
 msgstr "WARNING:"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:195
+#: pkgbuilder.py:197
 msgid "ERROR:"
 msgstr "ERROR:"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:369
+#: pkgbuilder.py:262
+#: pkgbuilder.py:278
+msgid "[ERR1001] AUR: HTTP Error {0}"
+msgstr "[ERR1001] AUR: HTTP Error {0}"
+
+#: pkgbuilder.py:376
 msgid " [installed: {0}]"
 msgstr " [installed: {0}]"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:371
+#: pkgbuilder.py:378
 msgid " [installed]"
 msgstr " [installed]"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:374
+#: pkgbuilder.py:381
 msgid "[out of date]"
 msgstr "[out of date]"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:380
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:383
+#: pkgbuilder.py:387
+#: pkgbuilder.py:390
 msgid "votes"
 msgstr "votes"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:422
+#: pkgbuilder.py:431
 msgid "The build function reported a proper build."
 msgstr "The build function reported a proper build."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:431
+#: pkgbuilder.py:440
 msgid "[ERR3451] validation: NOT installed"
 msgstr "[ERR3451] validation: NOT installed"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:435
+#: pkgbuilder.py:444
 msgid "[ERR3452] validation: outdated {0}"
 msgstr "[ERR3452] validation: outdated {0}"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438
+#: pkgbuilder.py:447
 msgid "[INF3450] validation: installed {0}"
 msgstr "[INF3450] validation: installed {0}"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:442
+#: pkgbuilder.py:451
 msgid "[ERR3301] makepkg returned 1."
 msgstr "[ERR3301] makepkg returned 1."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:447
+#: pkgbuilder.py:456
 msgid "[ERR3401] Building more AUR packages is required."
 msgstr "[ERR3401] Building more AUR packages is required."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:474
+#: pkgbuilder.py:481
+msgid "[ERR3102] download: HTTP Error {0}"
+msgstr "[ERR3102] download: HTTP Error {0}"
+
+#: pkgbuilder.py:483
 msgid "[ERR3101] download: 0 bytes downloaded"
 msgstr "[ERR3101] download: 0 bytes downloaded"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:491
+#: pkgbuilder.py:503
 msgid "[ERR3151] extract: no files extracted"
 msgstr "[ERR3151] extract: no files extracted"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:579
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:640
+#: pkgbuilder.py:591
+#: pkgbuilder.py:653
 msgid "[ERR3201] depcheck: cannot find {0} anywhere"
 msgstr "[ERR3201] depcheck: cannot find {0} anywhere"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:606
+#: pkgbuilder.py:619
 msgid "[ERR3001] Package {0} not found."
 msgstr "[ERR3001] Package {0} not found."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:609
-msgid "Building {0}..."
-msgstr "Building {0}..."
+#: pkgbuilder.py:622
+msgid "Building {0}…"
+msgstr "Building {0}…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:617
-msgid "Downloading the tarball..."
-msgstr "Downloading the tarball..."
+#. Okay, this package exists, great then.  Thanks, user.
+#: pkgbuilder.py:630
+msgid "Downloading the tarball…"
+msgstr "Downloading the tarball…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:620
+#: pkgbuilder.py:633
 msgid "{0} kB downloaded"
 msgstr "{0} kB downloaded"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:622
-msgid "Extracting..."
-msgstr "Extracting..."
+#: pkgbuilder.py:635
+msgid "Extracting…"
+msgstr "Extracting…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:623
+#: pkgbuilder.py:636
 msgid "{0} files extracted"
 msgstr "{0} files extracted"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:627
-msgid "Checking dependencies..."
-msgstr "Checking dependencies..."
+#: pkgbuilder.py:640
+msgid "Checking dependencies…"
+msgstr "Checking dependencies…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:632
+#: pkgbuilder.py:645
 msgid "found in system"
 msgstr "found in system"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:632
+#: pkgbuilder.py:645
 msgid "found in repos"
 msgstr "found in repos"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:633
+#: pkgbuilder.py:646
 msgid "found in the AUR"
 msgstr "found in the AUR"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:636
+#: pkgbuilder.py:649
 msgid "none found"
 msgstr "none found"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:650
+#: pkgbuilder.py:663
 msgid "[ERR3202] depcheck: UnicodeDecodeError.  The PKGBUILD cannot be read.  There are invalid UTF-8 characters (eg. in the Maintainer field.)  Error message: {0}"
 msgstr "[ERR3202] depcheck: UnicodeDecodeError.  The PKGBUILD cannot be read.  There are invalid UTF-8 characters (eg. in the Maintainer field.)  Error message: {0}"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:744
-msgid "Gathering data about packages..."
-msgstr "Gathering data about packages..."
+#: pkgbuilder.py:769
+#: pkgbuilder.py:771
+msgid "Gathering data about packages…"
+msgstr "Gathering data about packages…"
+
+#: pkgbuilder.py:777
+msgid "Targets ({0}): "
+msgstr "Targets ({0}): "
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:750
+#: pkgbuilder.py:779
 msgid "{0} upgradeable packages found:"
 msgstr "{0} upgradeable packages found:"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:752
+#: pkgbuilder.py:783
+#: pkgbuilder.py:785
 msgid "there is nothing to do"
 msgstr "there is nothing to do"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:756
+#: pkgbuilder.py:790
+#: pkgbuilder.py:794
 msgid "Proceed with installation? [Y/n] "
 msgstr "Proceed with installation? [Y/n] "
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:779
-msgid "A python3 AUR helper (sort of.)  Wrapper-friendly (pacman-like output.)"
-msgstr "A python3 AUR helper (sort of.)  Wrapper-friendly (pacman-like output.)"
+#: pkgbuilder.py:819
+msgid "An AUR helper/library.  Wrapper-friendly (pacman-like output.)"
+msgstr "An AUR helper/library.  Wrapper-friendly (pacman-like output.)"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:780
+#: pkgbuilder.py:820
 msgid "You can use pacman syntax if you want to."
 msgstr "You can use pacman syntax if you want to."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:786
+#: pkgbuilder.py:826
 msgid "packages to build"
 msgstr "packages to build"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:791
+#: pkgbuilder.py:831
 msgid "don't use                         colors in output"
 msgstr "don't use                         colors in output"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:794
+#: pkgbuilder.py:834
 msgid "don't                         check dependencies (may break makepkg)"
 msgstr "don't                         check dependencies (may break makepkg)"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:797
-msgid "pacman syntax compatiblity"
-msgstr "pacman syntax compatiblity"
+#: pkgbuilder.py:837
+msgid "don't                         install packages after building"
+msgstr "don't                         install packages after building"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:799
+#: pkgbuilder.py:840
 msgid "don't check                         if packages were installed after build"
 msgstr "don't check                         if packages were installed after build"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:802
+#: pkgbuilder.py:843
+msgid "pacman syntax compatiblity"
+msgstr "pacman syntax compatiblity"
+
+#: pkgbuilder.py:845
 msgid "pacman                         syntax compatiblity"
 msgstr "pacman                         syntax compatiblity"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:806
+#: pkgbuilder.py:848
 msgid "view package information"
 msgstr "view package information"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:808
+#: pkgbuilder.py:850
 msgid "search the                         AUR for matching strings"
 msgstr "search the                         AUR for matching strings"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:812
+#: pkgbuilder.py:854
 msgid "upgrade installed AUR packages"
 msgstr "upgrade installed AUR packages"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:832
+#: pkgbuilder.py:857
+msgid "chooses protocol (default: http)"
+msgstr "chooses protocol (default: http)"
+
+#: pkgbuilder.py:879
 msgid "Package {0} not found."
 msgstr "Package {0} not found."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:836
+#. ## TRANSLATORS: space it properly.  `yes/no' below are
+#. ## for `out of date'.
+#: pkgbuilder.py:883
 msgid ""
 "Category       : {cat}\n"
 "Name           : {nme}\n"
@@ -223,27 +247,33 @@ msgstr ""
 "Last Updated   : {upd}\n"
 "Description    : {dsc}\n"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:854
+#: pkgbuilder.py:901
 msgid "yes"
 msgstr "yes"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:855
+#: pkgbuilder.py:902
 msgid "no"
 msgstr "no"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:870
+#. this would be too many entries.  The API is really
+#. having this limitation, though.
+#: pkgbuilder.py:917
 msgid "[ERR5002] search string too short, API limitation"
 msgstr "[ERR5002] search string too short, API limitation"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:872
-msgid "Searching for exact match..."
-msgstr "Searching for exact match..."
+#: pkgbuilder.py:919
+msgid "Searching for exact match…"
+msgstr "Searching for exact match…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:875
+#: pkgbuilder.py:922
+#: INSTALL.py:84
+#: INSTALL.py:93
+#: INSTALL.py:102
+#: INSTALL.py:111
 msgid "not found"
 msgstr "not found"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:24
+#: INSTALL.py:53
 msgid ""
 "Hello!\n"
 "\n"
@@ -261,11 +291,23 @@ msgstr ""
 "and compile the package manually.\n"
 "\n"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:33
+#: INSTALL.py:62
 msgid "Hit Enter/Return to continue. "
 msgstr "Hit Enter/Return to continue. "
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:58
+#. Dependency check.
+#: INSTALL.py:73
+msgid "Performing a dependency check..."
+msgstr "Performing a dependency check..."
+
+#: INSTALL.py:81
+#: INSTALL.py:90
+#: INSTALL.py:99
+#: INSTALL.py:108
+msgid "found"
+msgstr "found"
+
+#: INSTALL.py:129
 msgid ""
 "\n"
 "\n"
@@ -287,7 +329,11 @@ msgstr ""
 "\n"
 "If I am wrong, though, congratulations!\n"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:69
+#: INSTALL.py:141
+msgid "Installing missing AUR dependencies..."
+msgstr "Installing missing AUR dependencies..."
+
+#: INSTALL.py:150
 msgid ""
 "\n"
 "\n"
@@ -315,7 +361,7 @@ msgstr ""
 "(zsh users: hash -r, other shells may need another command).  For\n"
 "python module usage, type `import pkgbuilder` into the python prompt.\n"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:85
+#: INSTALL.py:166
 msgid ""
 "It looks like you want to quit.  Okay then, goodbye.\n"
 "No work has been started yet.\n"
@@ -329,7 +375,7 @@ msgstr ""
 "If that's what you want to do, go for it.  If it isn't, run this\n"
 "script again."
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:91
+#: INSTALL.py:172
 msgid ""
 "It looks like you want to quit.  Okay then, goodbye.\n"
 "All the files this script was working on are placed in\n"
@@ -347,5 +393,3 @@ msgstr ""
 "If that's what you want to do, go for it.  If it isn't, run this\n"
 "script again."
 
-#~ msgid "found"
-#~ msgstr "found"
diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo
index 0a0263b..bce7486 100644
Binary files a/locale/pl/LC_MESSAGES/pkgbuilder.mo and b/locale/pl/LC_MESSAGES/pkgbuilder.mo differ
diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.po b/locale/pl/LC_MESSAGES/pkgbuilder.po
index cf8b02f..6ec7768 100644
--- a/locale/pl/LC_MESSAGES/pkgbuilder.po
+++ b/locale/pl/LC_MESSAGES/pkgbuilder.po
@@ -1,203 +1,227 @@
 # PKGBUILDer pot file.
-# Copyright (C) 2011 Kwpolska.
-# Kwpolska <kwpolska@kwpolska.tk>, 2011.
+# Copyright (C) 2011-2012, Kwpolska.
+# This file is distributed under the same license as the PKGBUILDer package.
+# Kwpolska <kwpolska@kwpolska.tk>, 2011-2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.1.4\n"
+"Project-Id-Version: 2.1.2.31\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-22 10:17+0100\n"
-"PO-Revision-Date: 2011-10-22 10:18+0100\n"
+"POT-Creation-Date: 2011-10-22 10:16+0100\n"
+"PO-Revision-Date: 2012-07-27 14:20+0100\n"
 "Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
-"Language-Team: \n"
-"Language: \n"
+"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-Basepath: /home/kwpolska/git/pkgbuilder\n"
-"X-Poedit-SearchPath-0: /home/kwpolska/git/pkgbuilder\n"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:88
-msgid "[ERR5001] Aborted by user! Exiting..."
-msgstr "[ERR5001] Przerwane przez użytkownika!  Kończenie..."
+#: pkgbuilder.py:90
+msgid "[ERR5001] Aborted by user! Exiting…"
+msgstr "[ERR5001] Przerwane przez użytkownika! Kończenie..."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:181
+#: pkgbuilder.py:183
 msgid "WARNING:"
 msgstr "UWAGA:"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:195
+#: pkgbuilder.py:197
 msgid "ERROR:"
 msgstr "BŁĄD:"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:369
+#: pkgbuilder.py:262
+#: pkgbuilder.py:278
+msgid "[ERR1001] AUR: HTTP Error {0}"
+msgstr "[ERR1001] AUR: Błąd HTTP {0}"
+
+#: pkgbuilder.py:376
 msgid " [installed: {0}]"
 msgstr " [zainstalowano: {0}]"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:371
+#: pkgbuilder.py:378
 msgid " [installed]"
 msgstr " [zainstalowano]"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:374
+#: pkgbuilder.py:381
 msgid "[out of date]"
 msgstr "[nieaktualny]"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:380
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:383
+#: pkgbuilder.py:387
+#: pkgbuilder.py:390
 msgid "votes"
 msgstr "głosów"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:422
+#: pkgbuilder.py:431
 msgid "The build function reported a proper build."
 msgstr "Funkcja budowania paczek powiadomiła o prawidłowym zbudowaniu."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:431
+#: pkgbuilder.py:440
 msgid "[ERR3451] validation: NOT installed"
 msgstr "[ERR3451] walidacja: NIE zainstalowano"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:435
+#: pkgbuilder.py:444
 msgid "[ERR3452] validation: outdated {0}"
 msgstr "[ERR3452] walidacja: nieaktualne {0}"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438
+#: pkgbuilder.py:447
 msgid "[INF3450] validation: installed {0}"
 msgstr "[INF3450] walidacja: zainstalowane {0}"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:442
+#: pkgbuilder.py:451
 msgid "[ERR3301] makepkg returned 1."
 msgstr "[ERR3301] makepkg zwrócił 1."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:447
+#: pkgbuilder.py:456
 msgid "[ERR3401] Building more AUR packages is required."
 msgstr "[ERR3401] Należy zainstalować więcej pakietów z AUR."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:474
+#: pkgbuilder.py:481
+msgid "[ERR3102] download: HTTP Error {0}"
+msgstr "[ERR3102] download: Błąd HTTP {0}"
+
+#: pkgbuilder.py:483
 msgid "[ERR3101] download: 0 bytes downloaded"
 msgstr "[ERR3101] download: ściągnięto 0 bajtów"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:491
+#: pkgbuilder.py:503
 msgid "[ERR3151] extract: no files extracted"
 msgstr "[ERR3151] extract: wypakowano 0 plików"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:579
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:640
+#: pkgbuilder.py:591
+#: pkgbuilder.py:653
 msgid "[ERR3201] depcheck: cannot find {0} anywhere"
 msgstr "[ERR3201] depcheck: nie można nigdzie znaleźć pakietu {0}"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:606
+#: pkgbuilder.py:619
 msgid "[ERR3001] Package {0} not found."
 msgstr "[ERR3001] Nie znaleziono pakietu {0}."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:609
-msgid "Building {0}..."
+#: pkgbuilder.py:622
+msgid "Building {0}…"
 msgstr "Budowanie {0}..."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:617
-msgid "Downloading the tarball..."
-msgstr "Ściąganie paczki..."
+#. Okay, this package exists, great then.  Thanks, user.
+#: pkgbuilder.py:630
+msgid "Downloading the tarball…"
+msgstr "Ściąganie tarballa…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:620
+#: pkgbuilder.py:633
 msgid "{0} kB downloaded"
 msgstr "ściągnięto {0} kB"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:622
-msgid "Extracting..."
-msgstr "Wypakowywanie..."
+#: pkgbuilder.py:635
+msgid "Extracting…"
+msgstr "Wypakowywanie…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:623
+#: pkgbuilder.py:636
 msgid "{0} files extracted"
 msgstr "wypakowano {0} plików"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:627
-msgid "Checking dependencies..."
-msgstr "Sprawdzanie zależności..."
+#: pkgbuilder.py:640
+msgid "Checking dependencies…"
+msgstr "Sprawdzanie zależności…"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:632
+#: pkgbuilder.py:645
 msgid "found in system"
 msgstr "znaleziono w systemie"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:632
+#: pkgbuilder.py:645
 msgid "found in repos"
 msgstr "znaleziono w repozytoriach"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:633
+#: pkgbuilder.py:646
 msgid "found in the AUR"
 msgstr "znaleziono w AUR"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:636
+#: pkgbuilder.py:649
 msgid "none found"
 msgstr "brak"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:650
+#: pkgbuilder.py:663
 msgid "[ERR3202] depcheck: UnicodeDecodeError.  The PKGBUILD cannot be read.  There are invalid UTF-8 characters (eg. in the Maintainer field.)  Error message: {0}"
 msgstr "[ERR3202] depcheck: UnicodeDecodeError.  Nie można przeczytać PKGBUILD.  Znajdują się w nim nieprawidłowe znaki UTF-8.  Treść błędu: {0}"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:744
-msgid "Gathering data about packages..."
-msgstr "Zbieranie informacji o pakietach..."
+#: pkgbuilder.py:769
+#: pkgbuilder.py:771
+msgid "Gathering data about packages…"
+msgstr "Zbieranie informacji o pakietach…"
+
+#: pkgbuilder.py:777
+msgid "Targets ({0}): "
+msgstr "Cele ({0}):"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:750
+#: pkgbuilder.py:779
 msgid "{0} upgradeable packages found:"
 msgstr "Znaleziono {0} pakietów do aktualizacji:"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:752
+#: pkgbuilder.py:783
+#: pkgbuilder.py:785
 msgid "there is nothing to do"
 msgstr "nie ma nic do zrobienia"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:756
+#: pkgbuilder.py:790
+#: pkgbuilder.py:794
 msgid "Proceed with installation? [Y/n] "
 msgstr "Kontynuować instalację? [Y/n] "
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:779
-msgid "A python3 AUR helper (sort of.)  Wrapper-friendly (pacman-like output.)"
-msgstr "AUR helper w pythonie 3.  Przyjazny dla wrapperów."
+#: pkgbuilder.py:819
+msgid "An AUR helper/library.  Wrapper-friendly (pacman-like output.)"
+msgstr "Biblioteka/pomocnik AUR.  Przyjazna dla wrapperów (wyjście podobne do pacmana.)"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:780
+#: pkgbuilder.py:820
 msgid "You can use pacman syntax if you want to."
 msgstr "Jeśli chcesz, możesz używać składni pacmana."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:786
+#: pkgbuilder.py:826
 msgid "packages to build"
 msgstr "pakiety do zbudowania"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:791
+#: pkgbuilder.py:831
 msgid "don't use                         colors in output"
-msgstr "nie używa kolorów na wyjściu"
+msgstr "nie używa kolorów na wyjścu"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:794
+#: pkgbuilder.py:834
 msgid "don't                         check dependencies (may break makepkg)"
 msgstr "nie sprawdza zależności (może popsuć makepkg)"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:797
-msgid "pacman syntax compatiblity"
-msgstr "kompatybilność ze składnią pacmana"
+#: pkgbuilder.py:837
+msgid "don't                         install packages after building"
+msgstr "nie instaluje pakietów po zbudowaniu"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:799
+#: pkgbuilder.py:840
 msgid "don't check                         if packages were installed after build"
 msgstr "nie sprawdza czy pakiety zostały zainstalowane po zbudowaniu"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:802
+#: pkgbuilder.py:843
+msgid "pacman syntax compatiblity"
+msgstr "kompatybilność ze składnią pacmana"
+
+#: pkgbuilder.py:845
 msgid "pacman                         syntax compatiblity"
 msgstr "kompatybilność ze składnią pacmana"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:806
+#: pkgbuilder.py:848
 msgid "view package information"
 msgstr "wyświetla informację o pakiecie"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:808
+#: pkgbuilder.py:850
 msgid "search the                         AUR for matching strings"
 msgstr "przeszukuje AUR według pasujących ciągów"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:812
+#: pkgbuilder.py:854
 msgid "upgrade installed AUR packages"
-msgstr "uaktualnia zainstalowane pakiety"
+msgstr "uaktualnia zainstalowane pakiety z AUR"
+
+#: pkgbuilder.py:857
+msgid "chooses protocol (default: http)"
+msgstr "wybiera protokół (domyślnie: http)"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:832
+#: pkgbuilder.py:879
 msgid "Package {0} not found."
 msgstr "Nie znaleziono pakietu {0}."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:836
+#. ## TRANSLATORS: space it properly.  `yes/no' below are
+#. ## for `out of date'.
+#: pkgbuilder.py:883
 msgid ""
 "Category       : {cat}\n"
 "Name           : {nme}\n"
@@ -223,27 +247,33 @@ msgstr ""
 "Ost. aktualiz. : {upd}\n"
 "Opis           : {dsc}\n"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:854
+#: pkgbuilder.py:901
 msgid "yes"
 msgstr "tak"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:855
+#: pkgbuilder.py:902
 msgid "no"
 msgstr "nie"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:870
+#. this would be too many entries.  The API is really
+#. having this limitation, though.
+#: pkgbuilder.py:917
 msgid "[ERR5002] search string too short, API limitation"
 msgstr "[ERR5002] ciąg zbyt krótki, limitacja API"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:872
-msgid "Searching for exact match..."
+#: pkgbuilder.py:919
+msgid "Searching for exact match…"
 msgstr "Szukanie dokładnego dopasowania..."
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:875
+#: pkgbuilder.py:922
+#: INSTALL.py:84
+#: INSTALL.py:93
+#: INSTALL.py:102
+#: INSTALL.py:111
 msgid "not found"
 msgstr "nie znaleziono"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:24
+#: INSTALL.py:53
 msgid ""
 "Hello!\n"
 "\n"
@@ -261,11 +291,23 @@ msgstr ""
 "ręcznie.\n"
 "\n"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:33
+#: INSTALL.py:62
 msgid "Hit Enter/Return to continue. "
-msgstr "Wciśnij Enter/Return aby kontynuować."
+msgstr "Wciśnij Enter, aby kontynuować."
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:58
+#. Dependency check.
+#: INSTALL.py:73
+msgid "Performing a dependency check..."
+msgstr "Sprawdzanie zależności…"
+
+#: INSTALL.py:81
+#: INSTALL.py:90
+#: INSTALL.py:99
+#: INSTALL.py:108
+msgid "found"
+msgstr "znaleziono"
+
+#: INSTALL.py:129
 msgid ""
 "\n"
 "\n"
@@ -287,7 +329,11 @@ msgstr ""
 "\n"
 "Jeśli się mylę, gratulacje!\n"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:69
+#: INSTALL.py:141
+msgid "Installing missing AUR dependencies..."
+msgstr "Instalowanie brakujących zależności z AUR…"
+
+#: INSTALL.py:150
 msgid ""
 "\n"
 "\n"
@@ -304,7 +350,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Przeczytaj powyższy tekst.  Jeśli skrypt miał problemy, spróbuj\n"
+"Przeczytaj powyższe wyjście.  Jeśli skrypt miał problemy, spróbuj\n"
 "jeszcze raz.  Możesz też spróbować samodzielnie debugować pracę skryptu.\n"
 "Wszystkie pliki, nad którymi ten skrypt pracował, znajdują się w\n"
 "    {0}\n"
@@ -315,7 +361,7 @@ msgstr ""
 "inne powłoki mogą wymagać innej komendy).  Dla użycia jako moduł\n"
 "Pythona, wpisz `import pkgbuilder` do interpretera.\n"
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:85
+#: INSTALL.py:166
 msgid ""
 "It looks like you want to quit.  Okay then, goodbye.\n"
 "No work has been started yet.\n"
@@ -329,7 +375,7 @@ msgstr ""
 "Jeśli to jest to, co chcesz zrobić, proszę bardzo.  Jeśli nie,\n"
 "uruchom ten skrypt jeszcze raz."
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:91
+#: INSTALL.py:172
 msgid ""
 "It looks like you want to quit.  Okay then, goodbye.\n"
 "All the files this script was working on are placed in\n"
@@ -347,5 +393,3 @@ msgstr ""
 "Jeśli to jest to, co chcesz zrobić, proszę bardzo.  Jeśli nie,\n"
 "uruchom ten skrypt jeszcze raz."
 
-#~ msgid "found"
-#~ msgstr "znaleziono"
diff --git a/messages.pot b/messages.pot
index 8140fe9..a74c6e0 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1,203 +1,225 @@
 # PKGBUILDer pot file.
-# Copyright (C) 2011 Kwpolska.
-# Kwpolska <kwpolska@kwpolska.tk>, 2011.
+# Copyright (C) 2011-2012, Kwpolska.
+# This file is distributed under the same license as the PKGBUILDer package.
+# Kwpolska <kwpolska@kwpolska.tk>, 2011-2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.1.4\n"
+"Project-Id-Version: 2.1.2.31\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-10-22 10:16+0100\n"
 "PO-Revision-Date: 2011-10-22 10:17+0100\n"
 "Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
-"Language-Team: \n"
-"Language: \n"
+"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-Basepath: /home/kwpolska/git/pkgbuilder\n"
-"X-Poedit-SearchPath-0: /home/kwpolska/git/pkgbuilder\n"
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:88
-msgid "[ERR5001] Aborted by user! Exiting..."
+#: pkgbuilder.py:90
+msgid "[ERR5001] Aborted by user! Exiting…"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:181
+#: pkgbuilder.py:183
 msgid "WARNING:"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:195
+#: pkgbuilder.py:197
 msgid "ERROR:"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:369
+#: pkgbuilder.py:262 pkgbuilder.py:278
+msgid "[ERR1001] AUR: HTTP Error {0}"
+msgstr ""
+
+#: pkgbuilder.py:376
 msgid " [installed: {0}]"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:371
+#: pkgbuilder.py:378
 msgid " [installed]"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:374
+#: pkgbuilder.py:381
 msgid "[out of date]"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:380
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:383
+#: pkgbuilder.py:387 pkgbuilder.py:390
 msgid "votes"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:422
+#: pkgbuilder.py:431
 msgid "The build function reported a proper build."
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:431
+#: pkgbuilder.py:440
 msgid "[ERR3451] validation: NOT installed"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:435
+#: pkgbuilder.py:444
 msgid "[ERR3452] validation: outdated {0}"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438
+#: pkgbuilder.py:447
 msgid "[INF3450] validation: installed {0}"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:442
+#: pkgbuilder.py:451
 msgid "[ERR3301] makepkg returned 1."
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:447
+#: pkgbuilder.py:456
 msgid "[ERR3401] Building more AUR packages is required."
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:474
+#: pkgbuilder.py:481
+msgid "[ERR3102] download: HTTP Error {0}"
+msgstr ""
+
+#: pkgbuilder.py:483
 msgid "[ERR3101] download: 0 bytes downloaded"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:491
+#: pkgbuilder.py:503
 msgid "[ERR3151] extract: no files extracted"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:579
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:640
+#: pkgbuilder.py:591 pkgbuilder.py:653
 msgid "[ERR3201] depcheck: cannot find {0} anywhere"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:606
+#: pkgbuilder.py:619
 msgid "[ERR3001] Package {0} not found."
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:609
-msgid "Building {0}..."
+#: pkgbuilder.py:622
+msgid "Building {0}…"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:617
-msgid "Downloading the tarball..."
+#. Okay, this package exists, great then.  Thanks, user.
+#: pkgbuilder.py:630
+msgid "Downloading the tarball…"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:620
+#: pkgbuilder.py:633
 msgid "{0} kB downloaded"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:622
-msgid "Extracting..."
+#: pkgbuilder.py:635
+msgid "Extracting…"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:623
+#: pkgbuilder.py:636
 msgid "{0} files extracted"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:627
-msgid "Checking dependencies..."
+#: pkgbuilder.py:640
+msgid "Checking dependencies…"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:632
+#: pkgbuilder.py:645
 msgid "found in system"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:632
+#: pkgbuilder.py:645
 msgid "found in repos"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:633
+#: pkgbuilder.py:646
 msgid "found in the AUR"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:636
+#: pkgbuilder.py:649
 msgid "none found"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:650
-msgid "[ERR3202] depcheck: UnicodeDecodeError.  The PKGBUILD cannot be read.  There are invalid UTF-8 characters (eg. in the Maintainer field.)  Error message: {0}"
+#: pkgbuilder.py:663
+msgid ""
+"[ERR3202] depcheck: UnicodeDecodeError.  The PKGBUILD cannot be read.  There "
+"are invalid UTF-8 characters (eg. in the Maintainer field.)  Error message: "
+"{0}"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:744
-msgid "Gathering data about packages..."
+#: pkgbuilder.py:769 pkgbuilder.py:771
+msgid "Gathering data about packages…"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:750
+#: pkgbuilder.py:777
+msgid "Targets ({0}): "
+msgstr ""
+
+#: pkgbuilder.py:779
 msgid "{0} upgradeable packages found:"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:752
+#: pkgbuilder.py:783 pkgbuilder.py:785
 msgid "there is nothing to do"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:756
+#: pkgbuilder.py:790 pkgbuilder.py:794
 msgid "Proceed with installation? [Y/n] "
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:779
-msgid "A python3 AUR helper (sort of.)  Wrapper-friendly (pacman-like output.)"
+#: pkgbuilder.py:819
+msgid "An AUR helper/library.  Wrapper-friendly (pacman-like output.)"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:780
+#: pkgbuilder.py:820
 msgid "You can use pacman syntax if you want to."
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:786
+#: pkgbuilder.py:826
 msgid "packages to build"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:791
+#: pkgbuilder.py:831
 msgid "don't use                         colors in output"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:794
+#: pkgbuilder.py:834
 msgid "don't                         check dependencies (may break makepkg)"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:797
-msgid "pacman syntax compatiblity"
+#: pkgbuilder.py:837
+msgid "don't                         install packages after building"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:799
-msgid "don't check                         if packages were installed after build"
+#: pkgbuilder.py:840
+msgid ""
+"don't check                         if packages were installed after build"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:802
+#: pkgbuilder.py:843
+msgid "pacman syntax compatiblity"
+msgstr ""
+
+#: pkgbuilder.py:845
 msgid "pacman                         syntax compatiblity"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:806
+#: pkgbuilder.py:848
 msgid "view package information"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:808
+#: pkgbuilder.py:850
 msgid "search the                         AUR for matching strings"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:812
+#: pkgbuilder.py:854
 msgid "upgrade installed AUR packages"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:832
+#: pkgbuilder.py:857
+msgid "chooses protocol (default: http)"
+msgstr ""
+
+#: pkgbuilder.py:879
 msgid "Package {0} not found."
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:836
+#. ## TRANSLATORS: space it properly.  `yes/no' below are
+#. ## for `out of date'.
+#: pkgbuilder.py:883
 msgid ""
 "Category       : {cat}\n"
 "Name           : {nme}\n"
@@ -212,27 +234,29 @@ msgid ""
 "Description    : {dsc}\n"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:854
+#: pkgbuilder.py:901
 msgid "yes"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:855
+#: pkgbuilder.py:902
 msgid "no"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:870
+#. this would be too many entries.  The API is really
+#. having this limitation, though.
+#: pkgbuilder.py:917
 msgid "[ERR5002] search string too short, API limitation"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:872
-msgid "Searching for exact match..."
+#: pkgbuilder.py:919
+msgid "Searching for exact match…"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:875
+#: pkgbuilder.py:922 INSTALL.py:84 INSTALL.py:93 INSTALL.py:102 INSTALL.py:111
 msgid "not found"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:24
+#: INSTALL.py:53
 msgid ""
 "Hello!\n"
 "\n"
@@ -243,11 +267,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:33
+#: INSTALL.py:62
 msgid "Hit Enter/Return to continue. "
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:58
+#. Dependency check.
+#: INSTALL.py:73
+msgid "Performing a dependency check..."
+msgstr ""
+
+#: INSTALL.py:81 INSTALL.py:90 INSTALL.py:99 INSTALL.py:108
+msgid "found"
+msgstr ""
+
+#: INSTALL.py:129
 msgid ""
 "\n"
 "\n"
@@ -260,7 +293,11 @@ msgid ""
 "If I am wrong, though, congratulations!\n"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:69
+#: INSTALL.py:141
+msgid "Installing missing AUR dependencies..."
+msgstr ""
+
+#: INSTALL.py:150
 msgid ""
 "\n"
 "\n"
@@ -276,7 +313,7 @@ msgid ""
 "python module usage, type `import pkgbuilder` into the python prompt.\n"
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:85
+#: INSTALL.py:166
 msgid ""
 "It looks like you want to quit.  Okay then, goodbye.\n"
 "No work has been started yet.\n"
@@ -285,7 +322,7 @@ msgid ""
 "script again."
 msgstr ""
 
-#: /home/kwpolska/git/pkgbuilder/INSTALL.py:91
+#: INSTALL.py:172
 msgid ""
 "It looks like you want to quit.  Okay then, goodbye.\n"
 "All the files this script was working on are placed in\n"
@@ -295,4 +332,3 @@ msgid ""
 "If that's what you want to do, go for it.  If it isn't, run this\n"
 "script again."
 msgstr ""
-
diff --git a/messages.pot.header b/messages.pot.header
new file mode 100644
index 0000000..0159c0e
--- /dev/null
+++ b/messages.pot.header
@@ -0,0 +1,17 @@
+# PKGBUILDer pot file.
+# Copyright (C) 2011-2012, Kwpolska.
+# This file is distributed under the same license as the PKGBUILDer package.
+# Kwpolska <kwpolska@kwpolska.tk>, 2011-2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.1.2.31\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-22 10:16+0100\n"
+"PO-Revision-Date: 2011-10-22 10:17+0100\n"
+"Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
+"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
diff --git a/pkgbuilder.py b/pkgbuilder.py
index eb62310..f767a3b 100755
--- a/pkgbuilder.py
+++ b/pkgbuilder.py
@@ -82,7 +82,7 @@ def __init__(self):
         self.depcheck = True
         self.mkpginst = True
         self.protocol = 'http'
-        self.categories = ['E', 'E', 'daemons', 'devel', 'editors',
+        self.categories = ['ERROR', 'none', 'daemons', 'devel', 'editors',
                            'emulators', 'games', 'gnome', 'i18n', 'kde',
                            'lib', 'modules', 'multimedia', 'network',
                            'office', 'science', 'system', 'x11',
@@ -878,8 +878,8 @@ def main_routine():
                 if pkg == None:
                     raise PBError(_('Package {0} not found.').format(
                           pkgname))
-                ### TRANSLATORS: space it properly.  `yes/no' below are
-                ### for `out of date'.
+                # TRANSLATORS: space it properly.  `yes/no' below are
+                # for `out of date'.
                 print(_("""Category       : {cat}
 Name           : {nme}
 Version        : {ver}