[mythtv-commits] mythtv branch master updated by knightr. v0.26-pre-809-g27c9d46

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user knightr.
       via  27c9d464ba29b3cdd0addcfe98276be2ebb61a79 (commit)
       via  a0e517efb3f974e397f59cf99fd3e26d7481acb3 (commit)
       via  15d9bca14027a10caec8de3c726f9fa579c56118 (commit)
      from  a708e694b5870b288bcbe9e3ff10ff88fbce59c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 27c9d464ba29b3cdd0addcfe98276be2ebb61a79
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Sat, 7 Jul 2012 17:01:41 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Sat, 7 Jul 2012 17:01:41 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=27c9d464ba29b3cdd0addcfe98276be2ebb61a79

Merge branch 'master' of code.mythtv.org:mythtv



commit a0e517efb3f974e397f59cf99fd3e26d7481acb3
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Sat, 7 Jul 2012 17:01:11 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Sat, 7 Jul 2012 17:01:11 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a0e517efb3f974e397f59cf99fd3e26d7481acb3

Remove a concatenation in the scan progress message



commit 15d9bca14027a10caec8de3c726f9fa579c56118
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Sat, 7 Jul 2012 14:07:20 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Sat, 7 Jul 2012 14:07:20 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=15d9bca14027a10caec8de3c726f9fa579c56118

Removal of concatenations and translation context changes.
These setting pages were making heavy use of concatenation and
overuse of the QObject tr method and translation context.



-----------------------------------------------------------------------

Summary of changes:
 .../channelscan/channelscanner_gui_scan_pane.cpp   |    2 +-
 mythtv/programs/mythwelcome/welcomedialog.cpp      |   13 +-
 mythtv/programs/mythwelcome/welcomesettings.cpp    |  118 ++++++++++----------
 mythtv/programs/mythwelcome/welcomesettings.h      |    8 ++
 4 files changed, 74 insertions(+), 67 deletions(-)

--