[mythtv-commits] mythtv branch fixes/0.27 updated by knightr. v0.27-RC1-74-g8feafe9

[Git Repo Owner]

The branch, fixes/0.27 has been updated on the
mythtv repository by gitolite user knightr.
       via  8feafe977f969988fc240bd8daf900bc6f194f2f (commit)
       via  9aa6e820bc3af3d28011c0c5c4d7b093426d5cdc (commit)
      from  1416bb50ab75271bf111bcd89e4771d66b33fde0 (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 8feafe977f969988fc240bd8daf900bc6f194f2f
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Wed, 11 Sep 2013 07:17:16 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Wed, 11 Sep 2013 07:17:16 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8feafe977f969988fc240bd8daf900bc6f194f2f

Merge branch 'fixes/0.27' of code.mythtv.org:mythtv into fixes/0.27



commit 9aa6e820bc3af3d28011c0c5c4d7b093426d5cdc
Author:    Nicolas Riendeau <nriendeau at mythtv.org> at Tue, 10 Sep 2013 17:38:48 -0400
Committer: Nicolas Riendeau <nriendeau at mythtv.org> at Tue, 10 Sep 2013 17:46:14 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9aa6e820bc3af3d28011c0c5c4d7b093426d5cdc

Re-enable the translation of a string
Fix a small spacing problem at the same time...

This is done with the blessing of the translators even though we
are in full string freeze.

Conflicts:
	mythtv/programs/mythfrontend/globalsettings.cpp



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

Summary of changes:
 mythtv/programs/mythfrontend/globalsettings.cpp |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

--