Changeset 23633


Ignore:
Timestamp:
09/10/13 18:44:12 (9 years ago)
Author:
nit
Message:

[titan] fix lang

Location:
titan
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • titan/plugins/callmonitor1/callmon_main.h

    r20785 r23633  
    5858        struct skin* listbox = getscreennode(callmon_main, "listbox");
    5959        struct skin* fritzversion = getscreennode(callmon_main, "fritzversion");
    60         struct skin* ipaddresse = getscreennode(callmon_main, "ipaddresse");
     60        struct skin* ipaddress = getscreennode(callmon_main, "ipaddress");
    6161        struct skin* phonebook = getscreennode(callmon_main, "phonebook");
    6262        struct skin* userid = getscreennode(callmon_main, "userid");
     
    8282        changeinput(userid, getlist(myconfig, "FritzUser", NULL));
    8383       
    84         changemask(ipaddresse, "000.000.000.000");
     84        changemask(ipaddress, "000.000.000.000");
    8585        tmpstr = fixip(getlist(myconfig, "FRITZBOXIP", NULL), 0);
    86         changeinput(ipaddresse, tmpstr);
     86        changeinput(ipaddress, tmpstr);
    8787        free(tmpstr); tmpstr = NULL;
    8888       
     
    177177                        free(tmpstr); tmpstr = NULL;
    178178                       
    179                         tmpstr = fixip(ipaddresse->ret, 1);
     179                        tmpstr = fixip(ipaddress->ret, 1);
    180180                        addlist(myconfig, "FRITZBOXIP", tmpstr);
    181181                        free(tmpstr); tmpstr = NULL;
  • titan/plugins/networkbrowser/networkbrowser.h

    r23304 r23633  
    13271327        struct skin* tmp = NULL;
    13281328        struct skin* skin_sharename = getscreennode(net_addshare, "skin_sharename");
    1329         struct skin* skin_ip = getscreennode(net_addshare, "skin_ipaddresse");
     1329        struct skin* skin_ip = getscreennode(net_addshare, "skin_ipaddress");
    13301330        struct skin* skin_sharedir = getscreennode(net_addshare, "skin_sharedir");
    13311331        struct skin* skin_username = getscreennode(net_addshare, "skin_username");
  • titan/skins/callmonitor1/skin.xml

    r20785 r23633  
    22<node bordercol=bordercol scrollbar=auto type=listbox posy=center posx=center name=listbox width=85% height=70%>
    33<node name=fritzversion type=choicebox parent=listbox valign=middle posx=0 text="Fritzbox Firmware... >= 05.50" bordercol=bordercol bordersize=2 width=100% height=25>
    4 <node name=ipaddresse type=inputboxnum parent=listbox valign=middle posx=0 text="IP-FritzBox" bordercol=bordercol bordersize=2 width=100% height=25>
     4<node name=ipaddress type=inputboxnum parent=listbox valign=middle posx=0 text="IP-FritzBox" bordercol=bordercol bordersize=2 width=100% height=25>
    55<node name=userid type=inputbox parent=listbox valign=middle posx=0 text="Nutzername-Fritzbox (optional)" bordercol=bordercol bordersize=2 width=100% height=25>       
    66<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

    r20821 r23633  
    2929        <node parent="listbox" name="skin_usedns" text="usedns" type="choicebox" valign="middle" width="100%" height="35">
    3030        <node parent="listbox" name="skin_dns" text="dnsaddresse" type="inputbox" valign="middle" width="100%" height="35">
    31         <node parent="listbox" name="skin_ipaddresse" text="ipaddresse" type="inputboxnum" valign="middle" width="100%" height="35">
     31        <node parent="listbox" name="skin_ipaddress" text="ipaddress" type="inputboxnum" valign="middle" width="100%" height="35">
    3232        <node parent="listbox" name="skin_ftpport" text="ftpport" type="inputboxnum" valign="middle" width="100%" height="35">
    3333        <node parent="listbox" name="skin_sharedir" text="sharedir" type="inputbox" valign="middle" width="100%" height="35">
  • titan/titan/bgdownload.h

    r23206 r23633  
    171171                                if(dnode != NULL && dnode->ret == -1)
    172172                                {
    173                                         if(textbox(_("Message"), _("Realy stop download ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
     173                                        if(textbox(_("Message"), _("Really stop download ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
    174174                                                delbgdownload(nr, 1);
    175175                                        drawscreen(screenbgdownload, 0, 0);
  • titan/titan/harddisk.h

    r23286 r23633  
    346346                                        if(ret < 0)
    347347                                        {
    348                                                 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)
     348                                                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)
    349349                                                {
    350350                                                        drawscreen(load, 0, 0);
  • titan/titan/inetwork.h

    r23286 r23633  
    249249        for(tmpifa = ifa; tmpifa != NULL; tmpifa = tmpifa->ifa_next)
    250250        {
    251                 char* tmp_ipaddresse = NULL;
     251                char* tmp_ipaddress = NULL;
    252252                char* tmp_netmask = NULL;
    253253                char* tmp_mac = NULL;
     
    276276                {
    277277                        tmpstr = fixip(buf, 0);
    278                         tmp_ipaddresse = string_newline(ostrcat(tmpstr, NULL, 1, 0));
    279                 }
    280                 else
    281                         tmp_ipaddresse = ostrcat(tmp_ipaddresse, "000.000.000.000", 1, 0);
     278                        tmp_ipaddress = string_newline(ostrcat(tmpstr, NULL, 1, 0));
     279                }
     280                else
     281                        tmp_ipaddress = ostrcat(tmp_ipaddress, "000.000.000.000", 1, 0);
    282282
    283283                //NETMASK
     
    368368                {
    369369                        if(self == NULL)
    370                                 node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 0);
     370                                node = changeinetwork(tmp_device, tmp_ipaddress, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 0);
    371371                        else
    372                                 node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 1);
    373                 }
    374                 else
    375                         node = addinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, node);
     372                                node = changeinetwork(tmp_device, tmp_ipaddress, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, tmpinetwork, 1);
     373                }
     374                else
     375                        node = addinetwork(tmp_device, tmp_ipaddress, tmp_netmask, tmp_mac, tmp_broadcast, tmp_type, node);
    376376        }
    377377
  • titan/titan/network.h

    r23286 r23633  
    338338}
    339339
    340 void nethidden(struct skin* ipaddresse, struct skin* netmask, struct skin* gateway, struct skin* dnsserver1, struct skin* dnsserver2, int type)
    341 {
    342         ipaddresse->hidden = type;
     340void nethidden(struct skin* ipaddress, struct skin* netmask, struct skin* gateway, struct skin* dnsserver1, struct skin* dnsserver2, int type)
     341{
     342        ipaddress->hidden = type;
    343343        netmask->hidden = type;
    344344        gateway->hidden = type;
     
    353353        struct skin* listbox = getscreennode(network, "listbox");
    354354        struct skin* type = getscreennode(network, "type");
    355         struct skin* ipaddresse = getscreennode(network, "ipaddresse");
     355        struct skin* ipaddress = getscreennode(network, "ipaddress");
    356356        struct skin* netmask = getscreennode(network, "netmask");
    357357        struct skin* gateway = getscreennode(network, "gateway");
     
    365365                return;
    366366
    367         char* tmp_ipaddresse = ostrcat(net->ip, NULL, 0, 0);
     367        char* tmp_ipaddress = ostrcat(net->ip, NULL, 0, 0);
    368368        char* tmp_netmask = ostrcat(net->netmask, NULL, 0, 0);;
    369369        char* tmp_gateway = ostrcat(status.gateway, NULL, 0, 0);;
     
    372372        int tmp_type = net->type;
    373373
    374         changemask(ipaddresse, "000.000.000.000");
    375         changeinput(ipaddresse, net->ip);
     374        changemask(ipaddress, "000.000.000.000");
     375        changeinput(ipaddress, net->ip);
    376376
    377377        changemask(netmask, "000.000.000.000");
     
    394394        {
    395395                setchoiceboxselection(type, "1");
    396                 nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, YES);
     396                nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, YES);
    397397        }
    398398        else if(net->type == 2)
    399399        {
    400400                setchoiceboxselection(type, "2");
    401                 nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, YES);
     401                nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, YES);
    402402        }
    403403        else
    404404        {
    405405                setchoiceboxselection(type, "0");
    406                 nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, NO);
     406                nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, NO);
    407407        }
    408408
     
    438438                        {
    439439                                if(atoi(listbox->select->ret) == 0)
    440                                         nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, NO);
     440                                        nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, NO);
    441441                                else
    442                                         nethidden(ipaddresse, netmask, gateway, dnsserver1, dnsserver2, YES);
     442                                        nethidden(ipaddress, netmask, gateway, dnsserver1, dnsserver2, YES);
    443443
    444444                                drawscreen(network, 0, 0);
    445445                                tmp_type = atoi(listbox->select->ret);
    446446                        }
    447                         else if(ostrcmp(listbox->select->name, "ipaddresse") == 0)
    448                         {
    449                                 free(tmp_ipaddresse);
    450                                 tmp_ipaddresse = ostrcat(listbox->select->ret, NULL, 0, 0);
     447                        else if(ostrcmp(listbox->select->name, "ipaddress") == 0)
     448                        {
     449                                free(tmp_ipaddress);
     450                                tmp_ipaddress = ostrcat(listbox->select->ret, NULL, 0, 0);
    451451                        }
    452452                        else if(ostrcmp(listbox->select->name, "netmask") == 0)
     
    477477                debug(50, "save settings");
    478478                debug(50, "type: %i", tmp_type);
    479                 debug(50, "ipaddresse: %s", tmp_ipaddresse);
     479                debug(50, "ipaddress: %s", tmp_ipaddress);
    480480                debug(50, "netmask: %s", tmp_netmask);
    481481                debug(50, "gateway: %s", tmp_gateway);
     
    483483                debug(50, "dnsserver2: %s", tmp_dnsserver2);
    484484
    485                 if(ostrcmp(net->ip, tmp_ipaddresse) != 0)
     485                if(ostrcmp(net->ip, tmp_ipaddress) != 0)
    486486                {
    487487                        free(net->ip);
    488                         net->ip = ostrcat(tmp_ipaddresse, NULL, 0, 0);
     488                        net->ip = ostrcat(tmp_ipaddress, NULL, 0, 0);
    489489                }
    490490                if(ostrcmp(net->netmask, tmp_netmask) != 0)
     
    523523        }
    524524
    525         free(tmp_ipaddresse);
     525        free(tmp_ipaddress);
    526526        free(tmp_netmask);
    527527        free(tmp_gateway);
  • titan/titan/play.h

    r23572 r23633  
    11711171                if(getservicebyrecname(file, 0, 0) != NULL)
    11721172                        textbox(_("Message"), _("Record in progress"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0);
    1173                 else if(textbox(_("Realy Delete ?"), file, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
     1173                else if(textbox(_("Really Delete ?"), file, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
    11741174                {
    11751175                        unlink(file);
  • titan/titan/rectimer.h

    r23286 r23633  
    534534                                node->status = 3;
    535535                        free(node->errstr);
    536                         node->errstr = ostrcat(_("not started akttime greater timer endtime"), NULL, 0, 0);
     536                        node->errstr = ostrcat(_("not started akttime higher timer endtime"), NULL, 0, 0);
    537537                        status.writerectimer = 1;
    538538                }
  • titan/titan/restoredefault.h

    r23420 r23633  
    88        struct skin* load = getscreen("loading");
    99
    10         ret = textbox(_("Message"), _("Realy restore default settings ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
     10        ret = textbox(_("Message"), _("Really restore default settings ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
    1111
    1212        if(ret == 1)
     
    1717                {
    1818                        system(tmpstr);
    19                         textbox(_("Message"), _("Receiver now reboot !!!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 7, 0);
     19                        textbox(_("Message"), _("Receiver reboots now !!!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 7, 0);
    2020                        oshutdown(2, 2);;
    2121                }
     
    3030        struct skin* load = getscreen("loading");
    3131
    32         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)
     32        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)
    3333        {
    3434                debug(40, "Erase-Mtd");
  • titan/titan/scan.h

    r22445 r23633  
    15951595                        }
    15961596                        clearscreen(load);
    1597                         textbox(_("Message"), _("All new channel added!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
     1597                        textbox(_("Message"), _("All new channels added!"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
    15981598                }
    15991599
     
    16161616        if(clear == 1)
    16171617        {
    1618                 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)
     1618                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)
    16191619                        delunusedbouquetchannels(0);
    16201620                else
  • titan/titan/service.h

    r23286 r23633  
    937937                {
    938938                        case 1:
    939                                 tmpstr = ostrcat(_("Can't find a Tuner.\nAlle Tuners in use or no Tuner defined."), NULL, 0, 0);
     939                                tmpstr = ostrcat(_("Can't find a Tuner.\nAll Tuners in use or no Tuner defined."), NULL, 0, 0);
    940940                                break;
    941941                        case 2:
  • titan/titan/skinselector.h

    r23360 r23633  
    216216                                else
    217217                                {
    218                                         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);
     218                                        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);
    219219                                        drawscreen(screen, 0, 0);
    220220                                        free(tmpstr); tmpstr = NULL;
Note: See TracChangeset for help on using the changeset viewer.