diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-08-01 13:57:53 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-08-01 13:57:53 +0200 |
| commit | 881d9831fc988c0c4825102b8a5a45d2f0e51804 (patch) | |
| tree | 45ab64ddd0bb1574789b3ac20ba59f5a0c9cf318 | |
| parent | 0ef54a409801ef8e8ffd9dd45146094c2b553abc (diff) | |
| parent | 7011c8eddfdf1b12a1249e01323db57f05e0334e (diff) | |
| download | mana-881d9831fc988c0c4825102b8a5a45d2f0e51804.tar.gz mana-881d9831fc988c0c4825102b8a5a45d2f0e51804.tar.bz2 mana-881d9831fc988c0c4825102b8a5a45d2f0e51804.tar.xz mana-881d9831fc988c0c4825102b8a5a45d2f0e51804.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/resources/image.cpp
| -rw-r--r-- | po/uk.po | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -15,8 +15,7 @@ msgstr "" "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 or n%100>=20) ? 1 : 2);\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" "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" |