Alex Henrie : winmm: Improve grammar by changing "or" to "and" in an error message.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4dc69d0c454b1bdc4a123291f6a1b68631224ecd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4dc69d0c454b1bdc4a123291f6a1b68631224ecd

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Sun May 10 22:13:42 2015 -0600

winmm: Improve grammar by changing "or" to "and" in an error message.

---

 dlls/winmm/winmm.rc  | 2 +-
 po/ar.po             | 6 +++++-
 po/bg.po             | 2 +-
 po/ca.po             | 6 +++++-
 po/cs.po             | 6 +++++-
 po/da.po             | 6 +++++-
 po/de.po             | 6 +++++-
 po/el.po             | 2 +-
 po/en.po             | 6 +++---
 po/en_US.po          | 4 ++--
 po/eo.po             | 2 +-
 po/es.po             | 6 +++++-
 po/fa.po             | 2 +-
 po/fi.po             | 6 +++++-
 po/fr.po             | 6 +++++-
 po/he.po             | 2 +-
 po/hi.po             | 2 +-
 po/hr.po             | 2 +-
 po/hu.po             | 6 +++++-
 po/it.po             | 6 +++++-
 po/ja.po             | 6 +++++-
 po/ko.po             | 6 +++++-
 po/lt.po             | 6 +++++-
 po/ml.po             | 2 +-
 po/nb_NO.po          | 6 +++++-
 po/nl.po             | 6 +++++-
 po/or.po             | 2 +-
 po/pa.po             | 2 +-
 po/pl.po             | 6 +++++-
 po/pt_BR.po          | 6 +++++-
 po/pt_PT.po          | 6 +++++-
 po/rm.po             | 2 +-
 po/ro.po             | 6 +++++-
 po/ru.po             | 6 +++++-
 po/sk.po             | 2 +-
 po/sl.po             | 6 +++++-
 po/sr_RS at cyrillic.po | 2 +-
 po/sr_RS at latin.po    | 2 +-
 po/sv.po             | 6 +++++-
 po/te.po             | 2 +-
 po/th.po             | 2 +-
 po/tr.po             | 6 +++++-
 po/uk.po             | 6 +++++-
 po/wa.po             | 2 +-
 po/wine.pot          | 2 +-
 po/zh_CN.po          | 2 +-
 po/zh_TW.po          | 6 +++++-
 47 files changed, 150 insertions(+), 50 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dc69d0c454b1bdc4a123291f6a1b68631224ecd