User: brucepearson Branch: HEAD Date: Thu, 16 Sep 2010 06:41:50 +0000 Modified files: /modules/translation_management/local_translations local_translations.module Log message: by brucepearson : fix merge conflicts. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/translation_manage...