From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 21 Jan 2011 09:51:28 +0000 (+0100)
Subject: Merge remote branch 'origin/mirceakitsune/translation_romanian'
X-Git-Tag: xonotic-v0.5.0~316^2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84f61e11c678a2eb26772becbdfac1963f63d6e3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mirceakitsune/translation_romanian'
---

84f61e11c678a2eb26772becbdfac1963f63d6e3
diff --cc languages.txt
index 94c3443f5,a15e536f0..468aa9319
--- a/languages.txt
+++ b/languages.txt
@@@ -1,6 -1,6 +1,7 @@@
  de German "Deutsch"
  en English "English"
  fr French "Français"
 +nl Dutch "Nederlands"
  pt Portuguese "Português"
  ru Russian "Русский"
 -ro Romanian "Romana"
++ro Romanian "Romana"
diff --cc xonotic-credits.txt
index d51184a1c,d47720182..bedf0d70e
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@@ -66,8 -66,10 +66,11 @@@ Ricardo "Hellgardia" Silv
  
  *Russian
  Lord Canistra
 +Nikoli
  
+ *Romanian
+ MirceaKitsune
+ 
  **Active Contributors
  Antonio "terencehill" Piu
  Ben "MooKow" Banker