Merge branch 'maint'

Conflicts:
	lib/libalpm/be_package.c

1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/po/sk.po b/scripts/po/sk.po
index 9754d484..230f5a41 100644
--- a/scripts/po/sk.po
+++ b/scripts/po/sk.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-02-02 00:05-0600\n"
-"PO-Revision-Date: 2012-02-06 19:50+0000\n"
-"Last-Translator: archetyp <archetyp@linuxmail.org>\n"
+"POT-Creation-Date: 2012-02-23 10:28-0600\n"
+"PO-Revision-Date: 2012-02-22 19:36+0000\n"
+"Last-Translator: jose1711 <jose1711@gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/sk/)\n"
+"language/sk/)\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@ msgid "Cleaning up..."
 msgstr "Prebieha čistenie..."
 
 msgid "Entering %s environment..."
-msgstr "Vkladám %s prostredie..."
+msgstr "Vstupujem do prostredia %s..."
 
 msgid "Unable to find source file %s."
 msgstr "Nepodarilo sa nájsť zdrojový súbor %s."