Merge branch 'maint'

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

1 files changed, 30 insertions, 36 deletions

diff --git a/po/nl.po b/po/nl.po
index 93e67d7..82a932d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # jelly <jelle@vdwaa.nl>, 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-18 22:00+0000\n"
-"Last-Translator: jelly <jelle@vdwaa.nl>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/aur/team/nl/)\n"
-"Language: nl\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: Dutch (http://www.transifex.net/projects/p/aur/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgid "Home"
@@ -23,16 +24,12 @@ msgstr "Home"
 msgid ""
 "Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU "
 "Guidelines%h for more information."
-msgstr ""
-"Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU "
-"Guidelines%h for more information."
+msgstr "Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information."
 
 msgid ""
 "Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h "
 "otherwise they will be deleted!"
-msgstr ""
-"Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h "
-"otherwise they will be deleted!"
+msgstr "Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h otherwise they will be deleted!"
 
 msgid "Remember to vote for your favourite packages!"
 msgstr "Vergeet niet te stemmen voor je favoriete pakketten!"
@@ -46,9 +43,7 @@ msgstr "DISCLAIMER"
 msgid ""
 "Unsupported packages are user produced content. Any use of the provided "
 "files is at your own risk."
-msgstr ""
-"Niet-ondersteunde pakketten zijn gebruikers geproduceerde content. Elk "
-"gebruik van de geleverde bestanden is op eigen risico."
+msgstr "Niet-ondersteunde pakketten zijn gebruikers geproduceerde content. Elk gebruik van de geleverde bestanden is op eigen risico."
 
 msgid "Search Criteria"
 msgstr "Zoekcriteria"
@@ -60,10 +55,9 @@ msgid "Cannot find package to merge votes and comments into."
 msgstr ""
 
 msgid ""
-"The selected packages have not been deleted, check the confirmation checkbox."
-msgstr ""
-"De geselecteerde pakketten zijn niet gewist, controleer de bevestiging te "
-"schakelen."
+"The selected packages have not been deleted, check the confirmation "
+"checkbox."
+msgstr "De geselecteerde pakketten zijn niet gewist, controleer de bevestiging te schakelen."
 
 msgid "Error trying to retrieve package details."
 msgstr "Fout bij pakket details te halen."
@@ -181,10 +175,7 @@ msgid ""
 "A password reset request was submitted for the account associated with your "
 "e-mail address. If you wish to reset your password follow the link below, "
 "otherwise ignore this message and nothing will happen."
-msgstr ""
-"Een wachtwoord resetten verzoek was ingediend voor de rekening in verband "
-"met uw e-mail adres. Wilt u uw wachtwoord opnieuw op de onderstaande link, "
-"anders negeer dit bericht en niets zal gebeuren."
+msgstr "Een wachtwoord resetten verzoek was ingediend voor de rekening in verband met uw e-mail adres. Wilt u uw wachtwoord opnieuw op de onderstaande link, anders negeer dit bericht en niets zal gebeuren."
 
 msgid "Password Reset"
 msgstr "Password Reset"
@@ -208,8 +199,8 @@ msgid "Continue"
 msgstr "Blijven"
 
 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:"
@@ -219,11 +210,9 @@ msgid "Error - No file uploaded"
 msgstr "Fout - Geen bestand geupload"
 
 msgid ""
-"Error - unsupported file format (please submit gzip'ed tarballs generated by "
-"makepkg(8) only)."
-msgstr ""
-"Fout - niet-ondersteunde bestandsindeling (gelieve gzip'd tarballs "
-"gegenereerd door makepkg (8) alleen)."
+"Error - unsupported file format (please submit gzip'ed tarballs generated by"
+" makepkg(8) only)."
+msgstr "Fout - niet-ondersteunde bestandsindeling (gelieve gzip'd tarballs gegenereerd door makepkg (8) alleen)."
 
 msgid "Error - uncompressed file size too large."
 msgstr "Fout - ongecomprimeerd bestand te groot."
@@ -268,8 +257,8 @@ msgid "Could not change directory to %s."
 msgstr ""
 
 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"
@@ -549,6 +538,12 @@ msgstr "Bekijk gebruiker zijn pakketten"
 msgid "Bad username or password."
 msgstr "Verkeerd gebruiker of wachtwoord"
 
+msgid "Category"
+msgstr "Category"
+
+msgid "Change category"
+msgstr ""
+
 msgid "Votes"
 msgstr "Stemmen"
 
@@ -713,7 +708,9 @@ msgstr "Login"
 msgid "Forgot Password"
 msgstr "Password vergeten"
 
-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"
@@ -761,9 +758,6 @@ msgstr "Geen pakketen gevonden die aan uw zoekcriteria voldoen"
 msgid "Package Listing"
 msgstr "Pakketten lijst"
 
-msgid "Category"
-msgstr "Category"
-
 msgid "Name"
 msgstr "Naam"