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: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=84f61e11c678a2eb26772becbdfac1963f63d6e3;hp=-c

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

84f61e11c678a2eb26772becbdfac1963f63d6e3
diff --combined languages.txt
index 94c3443f5e,a15e536f04..468aa9319f
--- 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 --combined xonotic-credits.txt
index d51184a1c8,d47720182e..bedf0d70ed
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@@ -1,7 -1,7 +1,7 @@@
  **Core Team
  
  Rudolf "divVerent" Polzer
 --z-
 +Tyler "-z-" Mulligan
  Merlijn Hofstra
  morphed
  mand1nga
@@@ -14,7 -14,7 +14,7 @@@ tZor
  Diabolik a.k.a Dib
  
  *2D Art / Web
 --z- (web / game)
 +Tyler "-z-" Mulligan (web / game)
  FruitieX (game / web)
  
  *3D Art
@@@ -42,7 -42,7 +42,7 @@@ Fruitie
  tZork
  
  *Marketing / PR
 --z-
 +Tyler "-z-" Mulligan
  mand1nga
  
  *Legal
@@@ -66,8 -66,10 +66,11 @@@ Ricardo "Hellgardia" Silv
  
  *Russian
  Lord Canistra
 +Nikoli
  
+ *Romanian
+ MirceaKitsune
+ 
  **Active Contributors
  Antonio "terencehill" Piu
  Ben "MooKow" Banker