german/acroread8: resolve conflict
japanese/acroread8: resolve conflict
korean/acroread8: resolve conflict
german/acroread9: resolve conflict
french/acroread9: resolve conflict