summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2012-03-09 09:27:49 +0100
committerLukas Fleischer <archlinux@cryptocrack.de>2012-03-09 09:27:49 +0100
commit1e29bd2217f4320d3df156c448bf16aaeaec53d6 (patch)
tree97fcadd8516f137d598ed30c392b9922176ab2ab /web
parentf5e1652bf95ed7b63a27042d8bb8b1195d7c9158 (diff)
parentbfb25807c49d3f35cdce91947a442455e1940392 (diff)
downloadaur-1e29bd2217f4320d3df156c448bf16aaeaec53d6.tar.gz
aur-1e29bd2217f4320d3df156c448bf16aaeaec53d6.tar.xz
Merge branch 'maint'HEADmaster
Conflicts: UPGRADING web/lib/config.inc.php.proto
Diffstat (limited to 'web')
-rw-r--r--web/lib/translator.inc.php4
-rw-r--r--web/lib/version.inc.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php
index 0bcfb9c0..f269b937 100644
--- a/web/lib/translator.inc.php
+++ b/web/lib/translator.inc.php
@@ -32,11 +32,11 @@ $SUPPORTED_LANGS = array(
"hr" => "Hrvatski",
"hu" => "Magyar",
"it" => "Italiano",
- "nb_NO" => "Norsk",
+ "nb" => "Norsk",
"nl" => "Dutch",
"pl" => "Polski",
- "pt" => "Português",
"pt_BR" => "Português (Brasil)",
+ "pt_PT" => "Português (Portugal)",
"ro" => "Română",
"ru" => "Русский",
"sr" => "Srpski",
diff --git a/web/lib/version.inc.php b/web/lib/version.inc.php
index feaa85e1..c9d17d86 100644
--- a/web/lib/version.inc.php
+++ b/web/lib/version.inc.php
@@ -1,3 +1,3 @@
<?php
-define("AUR_VERSION", "v1.9.0");
+define("AUR_VERSION", "v1.9.1");