am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '15eaee40a19c0d7391b5f209e4336e889be43297':
  tweak recovery text images
  localization for recovery messages