diff options
author | Lukas Fleischer <archlinux@cryptocrack.de> | 2012-03-09 09:27:49 +0100 |
---|---|---|
committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2012-03-09 09:27:49 +0100 |
commit | 1e29bd2217f4320d3df156c448bf16aaeaec53d6 (patch) | |
tree | 97fcadd8516f137d598ed30c392b9922176ab2ab /po/Makefile | |
parent | f5e1652bf95ed7b63a27042d8bb8b1195d7c9158 (diff) | |
parent | bfb25807c49d3f35cdce91947a442455e1940392 (diff) | |
download | aurweb-1e29bd2217f4320d3df156c448bf16aaeaec53d6.tar.xz |
Merge branch 'maint'
Conflicts:
UPGRADING
web/lib/config.inc.php.proto
Diffstat (limited to 'po/Makefile')
-rw-r--r-- | po/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/po/Makefile b/po/Makefile index 84826ab..8629628 100644 --- a/po/Makefile +++ b/po/Makefile @@ -14,11 +14,11 @@ POFILES = \ hr.po \ hu.po \ it.po \ - nb_NO.po \ + nb.po \ nl.po \ pl.po \ - pt.po \ pt_BR.po \ + pt_PT.po \ ro.po \ ru.po \ sr.po \ |