[Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used
[Translation] Grammar fix
Merge branch '2.2' into 2.3

* 2.2:
  fix typo in test skipped message
  [Form] Fixed Form::all() signature for PHP 5.3.3
  [Translation] Grammar fix
  [Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used

Conflicts:
	src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php