Merge branch 'maint'HEADmaster

Conflicts:
	UPGRADING
	web/lib/config.inc.php.proto

1 files changed, 26 insertions, 27 deletions

diff --git a/po/hr.po b/po/hr.po
index a95ca687..754273ee 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,22 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch User Repository (AUR)\n"
 "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
-"POT-Creation-Date: 2011-08-13 12:46+0200\n"
-"PO-Revision-Date: 2011-04-10 13:28+0000\n"
-"Last-Translator: cryptocrack <transifex@cryptocrack.de>\n"
+"POT-Creation-Date: 2011-09-05 17:02+0200\n"
+"PO-Revision-Date: 2011-09-05 15:03+0000\n"
+"Last-Translator: Lukas Fleischer <transifex@cryptocrack.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 msgid "Home"
 msgstr "Početna"
@@ -55,7 +55,8 @@ msgid "Cannot find package to merge votes and comments into."
 msgstr ""
 
 msgid ""
-"The selected packages have not been deleted, check the confirmation checkbox."
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
 msgstr ""
 
 msgid "Error trying to retrieve package details."
@@ -80,9 +81,7 @@ msgid "Use this form to update your account."
 msgstr "Ovim formulatom ažurirajte Vaš računa."
 
 msgid "Leave the password fields blank to keep your same password."
-msgstr ""
-"Nemojte ispunjavati poslja za lozinku ukoliko želite zadržati dosadašnju "
-"lozinku."
+msgstr "Nemojte ispunjavati poslja za lozinku ukoliko želite zadržati dosadašnju lozinku."
 
 msgid "You must log in to view user information."
 msgstr "Morate se logirati kako bi pregledali informacije o korisniku."
@@ -200,8 +199,8 @@ msgid "Continue"
 msgstr ""
 
 msgid ""
-"If you have forgotten the e-mail address you used to register, please send a "
-"message to the %haur-general%h mailing list."
+"If you have forgotten the e-mail address you used to register, please send a"
+" message to the %haur-general%h mailing list."
 msgstr ""
 
 msgid "Enter your e-mail address:"
@@ -211,8 +210,8 @@ msgid "Error - No file uploaded"
 msgstr "Greška - datoteka nije poslana"
 
 msgid ""
-"Error - unsupported file format (please submit gzip'ed tarballs generated by "
-"makepkg(8) only)."
+"Error - unsupported file format (please submit gzip'ed tarballs generated by"
+" makepkg(8) only)."
 msgstr ""
 
 msgid "Error - uncompressed file size too large."
@@ -228,9 +227,7 @@ msgid "Error - source tarball may not contain nested subdirectories."
 msgstr ""
 
 msgid "Error trying to unpack upload - PKGBUILD does not exist."
-msgstr ""
-"Došlo je do greške prilikom raspakiravanja poslane datoteke - PKGBUILD ne "
-"postoji."
+msgstr "Došlo je do greške prilikom raspakiravanja poslane datoteke - PKGBUILD ne postoji."
 
 #, php-format
 msgid "Missing %s variable in PKGBUILD."
@@ -260,8 +257,8 @@ msgid "Could not change directory to %s."
 msgstr "Nisam mogao promijeniti direktorij u %s."
 
 msgid ""
-"Upload your source packages here. Create source packages with `makepkg --"
-"source`."
+"Upload your source packages here. Create source packages with `makepkg "
+"--source`."
 msgstr ""
 
 msgid "Package Category"
@@ -541,6 +538,12 @@ msgstr "Pregledaj pakete ovog korisnika"
 msgid "Bad username or password."
 msgstr ""
 
+msgid "Category"
+msgstr "Kategorija"
+
+msgid "Change category"
+msgstr ""
+
 msgid "Votes"
 msgstr "Glasovi"
 
@@ -705,7 +708,9 @@ msgstr "Login"
 msgid "Forgot Password"
 msgstr ""
 
-msgid "HTTP login is disabled. Please switch to HTTPs if you want to login: "
+#, php-format
+msgid ""
+"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
 msgstr ""
 
 msgid "Recent Updates"
@@ -753,9 +758,6 @@ msgstr "Nijedan paket ne odgovara kriterijima traženja."
 msgid "Package Listing"
 msgstr "Lista paketa"
 
-msgid "Category"
-msgstr "Kategorija"
-
 msgid "Name"
 msgstr "Ime"
 
@@ -836,6 +838,3 @@ msgstr ""
 
 msgid "Not Flagged"
 msgstr ""
-
-#~ msgid "New Package Notify"
-#~ msgstr "Obavijesti me o novim paketima"