intl: fix strings according to en_GB

diff --git a/src/dvr/dvr_config.c b/src/dvr/dvr_config.c
index 96037fc009c8c7d6a79438c6710de24896140d60..3e212219bfc4d2660b79d41c8b7756231e96d8e1 100644 (file)
--- a/src/dvr/dvr_config.c
+++ b/src/dvr/dvr_config.c
@@ -728,7 +728,7 @@ const idclass_t dvr_config_class = {
   .ic_perm       = dvr_config_class_perm,
   .ic_groups     = (const property_group_t[]) {
       {
-         .name   = N_("DVR Behavior"),
+         .name   = N_("DVR Behaviour"),
          .number = 1,
       },
       {

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
index c3705a6c3cd83f07f93d4ea288e3f1f7bf674241..d478202cf60fd87119245ccdde5e1778699b6458 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
@@ -302,7 +302,7 @@ const idclass_t linuxdvb_satconf_class =
     {
       .type     = PT_INT,
       .id       = "site_altitude",
-      .name     = N_("Altitude (meters)"),
+      .name     = N_("Altitude (metres)"),
       .off      = offsetof(linuxdvb_satconf_t, ls_site_altitude),
       .opts     = PO_ADVANCED,
       .def.i    = 0

diff --git a/src/main.c b/src/main.c
index 674a83fdeb758b75cf2dc33f5f80defa79510f9f..0bc36bef4618a7bd8cda9f4a531834253f8ac233 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -656,12 +656,12 @@ main(int argc, char **argv)
                           "no username and no password. Use with care as\n"
                           "it will allow world-wide administrative access\n"
                           "to your Tvheadend installation until you create or edit\n"
-                          "the access-control from within the Tvheadend web interface."),
+                          "the access control from within the Tvheadend web interface."),
       OPT_BOOL, &opt_firstrun },
 #if ENABLE_DBUS_1
     { 'U', "dbus",      N_("Enable DBus"),
       OPT_BOOL, &opt_dbus },
-    { 'e', "dbus_session", N_("DBus - use the session message bus instead system one"),
+    { 'e', "dbus_session", N_("DBus - use the session message bus instead of the system one"),
       OPT_BOOL, &opt_dbus_session },
 #endif
 #if ENABLE_LINUXDVB

diff --git a/src/profile.c b/src/profile.c
index e4b9696717a863cbca4b99c067788b9252a67646..bf793c34301e3234976068274c7e90cfbb9c62c4 100644 (file)
--- a/src/profile.c
+++ b/src/profile.c
@@ -998,7 +998,7 @@ const idclass_t profile_mpegts_pass_class =
 {
   .ic_super      = &profile_class,
   .ic_class      = "profile-mpegts",
-  .ic_caption    = N_("MPEG-TS Pass-thru/built-in"),
+  .ic_caption    = N_("MPEG-TS Pass-through/built-in"),
   .ic_properties = (const property_t[]){
     {
       .type     = PT_BOOL,
@@ -1803,7 +1803,7 @@ profile_init(void)
     htsmsg_add_bool(conf, "enabled", 1);
     htsmsg_add_bool(conf, "default", 1);
     htsmsg_add_str (conf, "name", name);
-    htsmsg_add_str (conf, "comment", _("MPEG-TS Pass-thru"));
+    htsmsg_add_str (conf, "comment", _("MPEG-TS Pass-through"));
     htsmsg_add_s32 (conf, "priority", PROFILE_SPRIO_NORMAL);
     htsmsg_add_bool(conf, "rewrite_pmt", 1);
     htsmsg_add_bool(conf, "rewrite_pat", 1);

diff --git a/src/streaming.c b/src/streaming.c
index 9371cb58fe5c4a78ed44282ac96d3521639286ae..d68637d929dea8255a973dd9b898c9bcb6e0432e 100644 (file)
--- a/src/streaming.c
+++ b/src/streaming.c
@@ -537,7 +537,7 @@ streaming_component_audio_type2desc(int audio_type)
     case 0: return ""; /* "Undefined" in the standard, but used for normal audio */
     case 1: return N_("Clean effects");
     case 2: return N_("Hearing impaired");
-    case 3: return N_("Visually impaired commentary");
+    case 3: return N_("Visually impaired commentary/audio description");
   }
 
   return N_("Reserved");

diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index 812db03f9af41f0b5b7ead42bd43369ad612e887..ac638df5c2305619507dc8923ba328f6ce52f5cf 100644 (file)
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -113,7 +113,7 @@ tvheadend.weekdaysRenderer = function(st) {
         var t = [];
         var d = v.push ? v : [v];
         if (d.length == 7) {
-            v = _("All days");
+            v = _("Every day");
         } else if (d.length == 0) {
             v = _("No days");
         } else {
@@ -321,7 +321,7 @@ tvheadend.dvr_finished = function(panel, index) {
         tabIndex: index,
         del: true,
         delquestion: _('Do you really want to delete the selected recordings?') + '<br/><br/>' +
-                     _('The associated file will be removed from the storage.'),
+                     _('The associated file will be removed from storage.'),
         list: 'disp_title,disp_subtitle,episode,start_real,stop_real,' +
               'duration,filesize,channelname,owner,creator,' +
               'config_name,sched_status,errors,data_errors,url,comment',
@@ -402,7 +402,7 @@ tvheadend.dvr_failed = function(panel, index) {
         tabIndex: index,
         del: true,
         delquestion: _('Do you really want to delete the selected recordings?') + '<br/><br/>' +
-                     _('The associated file will be removed from the storage.'),
+                     _('The associated file will be removed from storage.'),
         list: 'disp_title,disp_subtitle,episode,start_real,stop_real,' +
               'duration,filesize,channelname,owner,creator,config_name,' +
               'status,sched_status,errors,data_errors,url,comment',

diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index 9a119b3374b975a44bf12853f22b4a103a5ad3c1..d4be5df7efeb3f9e8ae7fc75676b632d491570fb 100644 (file)
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -485,8 +485,8 @@ tvheadend.epg = function() {
             {
                 width: 250,
                 id: 'subtitle',
-                header: _("SubTitle"),
-                tooltip: _("SubTitle"),
+                header: _("Subtitle"),
+                tooltip: _("Subtitle"),
                 dataIndex: 'subtitle',
                 renderer: renderText
             },

diff --git a/src/webui/static/app/status.js b/src/webui/static/app/status.js
index 1394d6b0ec43ed7e2ffe726ac0c56849fee1cacb..2aea43430614d3973ee770f2c2338d8f6a6512ef 100644 (file)
--- a/src/webui/static/app/status.js
+++ b/src/webui/static/app/status.js
@@ -338,7 +338,7 @@ tvheadend.status_streams = function(panel, index)
             },
             {
                 width: 50,
-                header: _("Subs #"),
+                header: _("Subs No."),
                 dataIndex: 'subs'
             },
             {

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index 0b6ff6cb19f08ae3daa16f1934142c9858fa2e59..4f0bd81bbc41cd27748fc7906c5e7c9fb8b51367 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -612,10 +612,10 @@ tvheadend.RootTabPanel = Ext.extend(Ext.TabPanel, {
             val = parseInt(val / 1000) + _('KB');
           return val;
         };
-        text = _('Disk space:') + '&nbsp;<b>' + human(bfree) + '/' + human(btotal) + '</b>';
+        text = _('Disc space') + ':&nbsp;<b>' + human(bfree) + '/' + human(btotal) + '</b>';
         var el = Ext.get(this.diskSpaceItem.tabEl).child('span.x-tab-diskspace', true);
         el.innerHTML = text;
-        el.qtip = _('Free:') + ' ' + human(bfree) + ' ' + _('Total:') + ' ' + human(btotal);
+        el.qtip = _('Free') + ': ' + human(bfree) + ' ' + _('Total') + ': ' + human(btotal);
     },
 
     onLoginCmdClicked: function(e) {