Changeset 23633

Timestamp:

09/10/13 18:44:12 (10 years ago)

Author:

nit

Message:

[titan] fix lang

Location:

titan

Files:

• plugins/callmonitor1/callmon_main.h (modified) (3 diffs)
• plugins/networkbrowser/networkbrowser.h (modified) (1 diff)
• skins/callmonitor1/skin.xml (modified) (1 diff)
• skins/networkbrowser/skin.xml (modified) (1 diff)
• titan/bgdownload.h (modified) (1 diff)
• titan/harddisk.h (modified) (1 diff)
• titan/inetwork.h (modified) (3 diffs)
• titan/network.h (modified) (9 diffs)
• titan/play.h (modified) (1 diff)
• titan/rectimer.h (modified) (1 diff)
• titan/restoredefault.h (modified) (3 diffs)
• titan/scan.h (modified) (2 diffs)
• titan/service.h (modified) (1 diff)
• titan/skinselector.h (modified) (1 diff)

titan/plugins/callmonitor1/callmon_main.h

@@ -58 +58 @@
         struct skin* listbox = getscreennode(callmon_main, "listbox");
         struct skin* fritzversion = getscreennode(callmon_main, "fritzversion");
-        struct skin* ipaddresse = getscreennode(callmon_main, "ipaddresse");
+        struct skin* ipaddress = getscreennode(callmon_main, "ipaddress");
         struct skin* phonebook = getscreennode(callmon_main, "phonebook");
         struct skin* userid = getscreennode(callmon_main, "userid");
@@ -82 +82 @@
         changeinput(userid, getlist(myconfig, "FritzUser", NULL));
         
-        changemask(ipaddresse, "000.000.000.000");
+        changemask(ipaddress, "000.000.000.000");
         tmpstr = fixip(getlist(myconfig, "FRITZBOXIP", NULL), 0);
-        changeinput(ipaddresse, tmpstr);
+        changeinput(ipaddress, tmpstr);
         free(tmpstr); tmpstr = NULL;
         
@@ -177 +177 @@
                         free(tmpstr); tmpstr = NULL;
                         
-                        tmpstr = fixip(ipaddresse->ret, 1);
+                        tmpstr = fixip(ipaddress->ret, 1);
                         addlist(myconfig, "FRITZBOXIP", tmpstr);
                         free(tmpstr); tmpstr = NULL;

titan/plugins/networkbrowser/networkbrowser.h

@@ -1327 +1327 @@
         struct skin* tmp = NULL;
         struct skin* skin_sharename = getscreennode(net_addshare, "skin_sharename");
-        struct skin* skin_ip = getscreennode(net_addshare, "skin_ipaddresse");
+        struct skin* skin_ip = getscreennode(net_addshare, "skin_ipaddress");
         struct skin* skin_sharedir = getscreennode(net_addshare, "skin_sharedir");
         struct skin* skin_username = getscreennode(net_addshare, "skin_username");

titan/skins/callmonitor1/skin.xml

@@ -2 +2 @@
 <node bordercol=bordercol scrollbar=auto type=listbox posy=center posx=center name=listbox width=85% height=70%>
 <node name=fritzversion type=choicebox parent=listbox valign=middle posx=0 text="Fritzbox Firmware... >= 05.50" bordercol=bordercol bordersize=2 width=100% height=25>
-<node name=ipaddresse type=inputboxnum parent=listbox valign=middle posx=0 text="IP-FritzBox" bordercol=bordercol bordersize=2 width=100% height=25>
+<node name=ipaddress type=inputboxnum parent=listbox valign=middle posx=0 text="IP-FritzBox" bordercol=bordercol bordersize=2 width=100% height=25>
 <node name=userid type=inputbox parent=listbox valign=middle posx=0 text="Nutzername-Fritzbox (optional)" bordercol=bordercol bordersize=2 width=100% height=25>        
 <node name=passwort type=inputbox parent=listbox valign=middle posx=0 text="Passwort-FritzBox" bordercol=bordercol bordersize=2 width=100% height=25>

titan/skins/networkbrowser/skin.xml

@@ -29 +29 @@
         <node parent="listbox" name="skin_usedns" text="usedns" type="choicebox" valign="middle" width="100%" height="35">
         <node parent="listbox" name="skin_dns" text="dnsaddresse" type="inputbox" valign="middle" width="100%" height="35">
-        <node parent="listbox" name="skin_ipaddresse" text="ipaddresse" type="inputboxnum" valign="middle" width="100%" height="35">
+        <node parent="listbox" name="skin_ipaddress" text="ipaddress" type="inputboxnum" valign="middle" width="100%" height="35">
         <node parent="listbox" name="skin_ftpport" text="ftpport" type="inputboxnum" valign="middle" width="100%" height="35">
         <node parent="listbox" name="skin_sharedir" text="sharedir" type="inputbox" valign="middle" width="100%" height="35">

titan/titan/bgdownload.h

@@ -171 +171 @@
                                 if(dnode != NULL && dnode->ret == -1)
                                 {
-                                        if(textbox(_("Message"), _("Realy stop download ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
+                                        if(textbox(_("Message"), _("Really stop download ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
                                                 delbgdownload(nr, 1);
                                         drawscreen(screenbgdownload, 0, 0);

titan/titan/harddisk.h

@@ -346 +346 @@
                                         if(ret < 0)
                                         {
-                                                if(textbox("Message", _("Directory has content\nRealy delete directory and content?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
+                                                if(textbox("Message", _("Directory has content\nReally delete directory and content?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
                                                 {
                                                         drawscreen(load, 0, 0);

titan/titan/inetwork.h

@@ -249 +249 @@
         for(tmpifa = ifa; tmpifa != NULL; tmpifa = tmpifa->ifa_next)
         {
-                char* tmp_ipaddresse = NULL;
+                char* tmp_ipaddress = NULL;
                 char* tmp_netmask = NULL;
                 char* tmp_mac = NULL;
@@ -276 +276 @@
                 {
                         tmpstr = fixip(buf, 0);
-                        tmp_ipaddresse = string_newline(ostrcat(tmpstr, NULL, 1, 0));
-                }
-                else
-                        tmp_ipaddresse = ostrcat(tmp_ipaddresse, "000.000.000.000", 1, 0);
+                        tmp_ipaddress = string_newline(ostrcat(tmpstr, NULL, 1, 0));
+                }
+                else
+                        tmp_ipaddress = ostrcat(tmp_ipaddress, "000.000.000.000", 1, 0);
 
                 //NETMASK
@@ -368 +368 @@
                 {
                         if(self == NULL)
-                                node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 0);
+                                node = changeinetwork(tmp_device, tmp_ipaddress, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 0);
                         else
-                                node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 1);
-                }
-                else
-                        node = addinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, node);
+                                node = changeinetwork(tmp_device, tmp_ipaddress, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 1);
+                }
+                else
+                        node = addinetwork(tmp_device, tmp_ipaddress, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, node);
         }
 

titan/titan/network.h

@@ -338 +338 @@
 }
 
-void nethidden(struct skin* ipaddresse, struct skin* netmask, struct skin* gateway, struct skin* dnsserver1, struct skin* dnsserver2, int type)
-{
-        ipaddresse->hidden = type;
+void nethidden(struct skin* ipaddress, struct skin* netmask, struct skin* gateway, struct skin* dnsserver1, struct skin* dnsserver2, int type)
+{
+        ipaddress->hidden = type;
         netmask->hidden = type;
         gateway->hidden = type;
@@ -353 +353 @@
         struct skin* listbox = getscreennode(network, "listbox");
         struct skin* type = getscreennode(network, "type");
-        struct skin* ipaddresse = getscreennode(network, "ipaddresse");
+        struct skin* ipaddress = getscreennode(network, "ipaddress");
         struct skin* netmask = getscreennode(network, "netmask");
         struct skin* gateway = getscreennode(network, "gateway");
@@ -365 +365 @@
                 return;
 
-        char* tmp_ipaddresse = ostrcat(net->ip, NULL, 0, 0);
+        char* tmp_ipaddress = ostrcat(net->ip, NULL, 0, 0);
         char* tmp_netmask = ostrcat(net->netmask, NULL, 0, 0);;
         char* tmp_gateway = ostrcat(status.gateway, NULL, 0, 0);;
@@ -372 +372 @@
         int tmp_type = net->type;
 
-        changemask(ipaddresse, "000.000.000.000");
-        changeinput(ipaddresse, net->ip);
+        changemask(ipaddress, "000.000.000.000");
+        changeinput(ipaddress, net->ip);
 
         changemask(netmask, "000.000.000.000");
@@ -394 +394 @@
         {
                 setchoiceboxselection(type, "1");
-                nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, YES);
+                nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, YES);
         }
         else if(net->type == 2)
         {
                 setchoiceboxselection(type, "2");
-                nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, YES);
+                nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, YES);
         }
         else
         {
                 setchoiceboxselection(type, "0");
-                nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, NO);
+                nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, NO);
         }
 
@@ -438 +438 @@
                         {
                                 if(atoi(listbox->select->ret) == 0)
-                                        nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, NO);
+                                        nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, NO);
                                 else
-                                        nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, YES);
+                                        nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, YES);
 
                                 drawscreen(network, 0, 0);
                                 tmp_type = atoi(listbox->select->ret);
                         }
-                        else if(ostrcmp(listbox->select->name, "ipaddresse") == 0)
-                        {
-                                free(tmp_ipaddresse);
-                                tmp_ipaddresse = ostrcat(listbox->select->ret, NULL, 0, 0);
+                        else if(ostrcmp(listbox->select->name, "ipaddress") == 0)
+                        {
+                                free(tmp_ipaddress);
+                                tmp_ipaddress = ostrcat(listbox->select->ret, NULL, 0, 0);
                         }
                         else if(ostrcmp(listbox->select->name, "netmask") == 0)
@@ -477 +477 @@
                 debug(50, "save settings");
                 debug(50, "type: %i", tmp_type);
-                debug(50, "ipaddresse: %s", tmp_ipaddresse);
+                debug(50, "ipaddress: %s", tmp_ipaddress);
                 debug(50, "netmask: %s", tmp_netmask);
                 debug(50, "gateway: %s", tmp_gateway);
@@ -483 +483 @@
                 debug(50, "dnsserver2: %s", tmp_dnsserver2);
 
-                if(ostrcmp(net->ip, tmp_ipaddresse) != 0)
+                if(ostrcmp(net->ip, tmp_ipaddress) != 0)
                 {
                         free(net->ip);
-                        net->ip = ostrcat(tmp_ipaddresse, NULL, 0, 0);
+                        net->ip = ostrcat(tmp_ipaddress, NULL, 0, 0);
                 }
                 if(ostrcmp(net->netmask, tmp_netmask) != 0)
@@ -523 +523 @@
         }
 
-        free(tmp_ipaddresse);
+        free(tmp_ipaddress);
         free(tmp_netmask);
         free(tmp_gateway);

titan/titan/play.h

@@ -1171 +1171 @@
                 if(getservicebyrecname(file, 0, 0) != NULL)
                         textbox(_("Message"), _("Record in progress"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0);
-                else if(textbox(_("Realy Delete ?"), file, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
+                else if(textbox(_("Really Delete ?"), file, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
                 {
                         unlink(file);

titan/titan/rectimer.h

@@ -534 +534 @@
                                 node->status = 3;
                         free(node->errstr);
-                        node->errstr = ostrcat(_("not started akttime greater timer endtime"), NULL, 0, 0);
+                        node->errstr = ostrcat(_("not started akttime higher timer endtime"), NULL, 0, 0);
                         status.writerectimer = 1;
                 }

titan/titan/restoredefault.h

@@ -8 +8 @@
         struct skin* load = getscreen("loading");
 
-        ret = textbox(_("Message"), _("Realy restore default settings ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
+        ret = textbox(_("Message"), _("Really restore default settings ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
 
         if(ret == 1)
@@ -17 +17 @@
                 {
                         system(tmpstr);
-                        textbox(_("Message"), _("Receiver now reboot !!!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 7, 0);
+                        textbox(_("Message"), _("Receiver reboots now !!!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 7, 0);
                         oshutdown(2, 2);;
                 }
@@ -30 +30 @@
         struct skin* load = getscreen("loading");
 
-        if(textbox(_("Message"), _("Do you really want to erase all datas and backups from Swap?\nThe Box will reboot and the erase will be started!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
+        if(textbox(_("Message"), _("Do you really want to erase all data and backups from Swap?\nThe Box will reboot and the erase will be started!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
         {
                 debug(40, "Erase-Mtd");

titan/titan/scan.h

@@ -1595 +1595 @@
                         }
                         clearscreen(load);
-                        textbox(_("Message"), _("All new channel added!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
+                        textbox(_("Message"), _("All new channels added!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
                 }
 
@@ -1616 +1616 @@
         if(clear == 1)
         {
-                if(textbox(_("Message"), _("Does you want delete all unused Bouquetentrys?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
+                if(textbox(_("Message"), _("Do you want delete all unused Bouquetentrys?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
                         delunusedbouquetchannels(0);
                 else

titan/titan/service.h

@@ -937 +937 @@
                 {
                         case 1:
-                                tmpstr = ostrcat(_("Can't find a Tuner.\nAlle Tuners in use or no Tuner defined."), NULL, 0, 0);
+                                tmpstr = ostrcat(_("Can't find a Tuner.\nAll Tuners in use or no Tuner defined."), NULL, 0, 0);
                                 break;
                         case 2:

titan/titan/skinselector.h

@@ -216 +216 @@
                                 else
                                 {
-                                        textbox(_("Message"), _("No skinconfig found in skin.\nCan't chage to selected skin."), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
+                                        textbox(_("Message"), _("No skinconfig found in skin.\nCan't change to selected skin."), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
                                         drawscreen(screen, 0, 0);
                                         free(tmpstr); tmpstr = NULL;