[mythtv-firehose] mythtv branch master updated by knightr. v0.26-pre-761-g7bbcf8b

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user knightr.
       via  7bbcf8b05d8b41a4d3446cc6b3b50cb66aec2d07 (commit)
       via  1a56a47bb849693138326a5d8a8af8699a569c58 (commit)
       via  c46be30362950ca6cf2784d3be9ab42a24f364c4 (commit)
       via  ea6ec5b5f029966653b2866f626a9f7d400f30cd (commit)
      from  e2a0efd88ce48698451a36fe9c15b390e7fdd73d (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 7bbcf8b05d8b41a4d3446cc6b3b50cb66aec2d07
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Wed, 4 Jul 2012 00:55:40 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Wed, 4 Jul 2012 00:55:40 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7bbcf8b05d8b41a4d3446cc6b3b50cb66aec2d07

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



commit 1a56a47bb849693138326a5d8a8af8699a569c58
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Wed, 4 Jul 2012 00:53:53 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Wed, 4 Jul 2012 00:53:53 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1a56a47bb849693138326a5d8a8af8699a569c58

Fix an incomplete error message and context changes.
This fix an incomplete error message and changes the translation
context of some strings while we are there...



commit c46be30362950ca6cf2784d3be9ab42a24f364c4
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Mon, 2 Jul 2012 00:50:23 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Mon, 2 Jul 2012 00:50:23 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c46be30362950ca6cf2784d3be9ab42a24f364c4

Fix the context of some strings are remove concaternations.



commit ea6ec5b5f029966653b2866f626a9f7d400f30cd
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Sun, 1 Jul 2012 21:58:08 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Sun, 1 Jul 2012 21:58:08 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ea6ec5b5f029966653b2866f626a9f7d400f30cd

Remove the concateration from two help texts.



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

Summary of changes:
 .../libs/libmythtv/channelscan/channelscanner.cpp  |   22 ++++++++++----------
 mythtv/libs/libmythtv/channelscan/channelscanner.h |    5 ++++
 mythtv/libs/libmythtv/diseqcsettings.cpp           |   12 +++++-----
 mythtv/libs/libmythtv/profilegroup.cpp             |   16 +++++++-------
 mythtv/libs/libmythtv/profilegroup.h               |    3 ++
 5 files changed, 33 insertions(+), 25 deletions(-)

--