Resolved merge conflict

Author: timlinux

doc/TRANSLATORS

@@ -24,8 +24,8 @@ German|Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
 Greek|Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves
 Hungarian|Siki Zoltan
 Icelandic|Thordur Ivarsson
-Indonesian|Januar V. Simarmata
-Italian|Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano
+Indonesian|Januar V. Simarmata, I Made Anombawa
+Italian|Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna
 Japanese|BABA Yoshihiko, Yoichi Kayama
 Lao|Anousak Souphavanh
 Latvian|Maris Nartiss, Pēteris Brūns