Fixed small conflicts in Translator.
-rw-r--r-- 33258 .cproject
-rw-r--r-- 530 .gitignore
-rw-r--r-- 2407 .project
drwxr-xr-x - .settings
-rw-r--r-- 35872 CHANGES
-rw-r--r-- 7917 LICENSE
-rw-r--r-- 14736 README
-rw-r--r-- 1960 README.ampi
-rw-r--r-- 9426 README.bigsim
-rw-r--r-- 6178 README.cygwin
-rw-r--r-- 6550 README.win
-rwxr-xr-x 19450 build
-rw-r--r-- 894 charm.spec
drwxr-xr-x - doc
drwxr-xr-x - examples
-rwxr-xr-x 857 relink.script
-rwxr-xr-x 13375 smart-build.pl
drwxr-xr-x - src
drwxr-xr-x - tests