Changeset 25930

Timestamp:

02/06/14 21:07:45 (8 years ago)

Author:

obi

Message:

next step

Location:

titan/titan

Files:

• hwtest.h (modified) (15 diffs)
• titan.c (modified) (1 diff)

titan/titan/hwtest.h

@@ -151 +151 @@
                         if(dvbnode->feinfo->type == FE_QPSK)
                         {
-                                char* tmpstr = ostrcat("[S]Lock & Search", " (", 0, 0);
+                                char* tmpstr = ostrcat(_("[S]Lock & Search"), " (", 0, 0);
                                 tmpstr = ostrcat(tmpstr, dvbnode->feinfo->name, 1, 0);
                                 tmpstr = ostrcat(tmpstr, ")", 1, 0);
@@ -158 +158 @@
                         if(dvbnode->feinfo->type == FE_OFDM)
                         {
-                                char* tmpstr = ostrcat("[T]Lock & Search", " (", 0, 0);
+                                char* tmpstr = ostrcat(_("[T]Lock & Search"), " (", 0, 0);
                                 tmpstr = ostrcat(tmpstr, dvbnode->feinfo->name, 1, 0);
                                 tmpstr = ostrcat(tmpstr, ")", 1, 0);
@@ -165 +165 @@
                         if(dvbnode->feinfo->type == FE_QAM)
                         {
-                                char* tmpstr = ostrcat("[C]Lock & Search", " (", 0, 0);
+                                char* tmpstr = ostrcat(_("[C]Lock & Search"), " (", 0, 0);
                                 tmpstr = ostrcat(tmpstr, dvbnode->feinfo->name, 1, 0);
                                 tmpstr = ostrcat(tmpstr, ")", 1, 0);
@@ -174 +174 @@
                 dvbnode = dvbnode->next;
         }
-        addmenulist(&mlist, "Front Display", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "Front Key", NULL, NULL, 0, 0);
-        //addmenulist(&mlist, "Color Bar", NULL, NULL, 0, 0);
-        //addmenulist(&mlist, "SCART 4:3 / 16:9", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "Smartcard", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "Network", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "USB Port", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "CAM", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "RS232", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "LNB", NULL, NULL, 0, 0);
-        addmenulist(&mlist, "Flash/Nand Check", NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("Front Display"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("Front Key"), NULL, NULL, 0, 0);
+        //addmenulist(&mlist, _("Color Bar"), NULL, NULL, 0, 0);
+        //addmenulist(&mlist, _("SCART 4:3 / 16:9"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("Smartcard"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("Network"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("USB Port"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("CAM"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("RS232"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("LNB"), NULL, NULL, 0, 0);
+        addmenulist(&mlist, _("Flash/Nand Check"), NULL, NULL, 0, 0);
         
         while(1)
         {
-                mbox = menulistbox(mlist, NULL, "Hardware Test", NULL, NULL, 1, 0);
+                mbox = menulistbox(mlist, NULL, _("Hardware Test"), NULL, NULL, 1, 0);
                 
                 if(mbox != NULL)
                 {
                         setmenulistdefault(mlist, mbox->name);
-                        if(ostrstr(mbox->name, "[S]Lock & Search") != NULL)
+                        if(ostrstr(mbox->name, _("[S]Lock & Search")) != NULL)
                         {
                                 clearscreen(load);
@@ -208 +208 @@
                         }
                         
-                        if(ostrstr(mbox->name, "[T]Lock & Search") != NULL)
+                        if(ostrstr(mbox->name, _("[T]Lock & Search")) != NULL)
                         {
                                 //struct transponder* createtransponder(uint64_t id, FE_OFDM, int orbitalpos, TEST_S2_FREQ, int inversion, TEST_S2_SYMBOL, int polarization, int fec, int modulation, int rolloff, int pilot, int system);                      
                         }
                         
-                        if(ostrstr(mbox->name, "[C]Lock & Search") != NULL)
+                        if(ostrstr(mbox->name, _("[C]Lock & Search")) != NULL)
                         {
                                 //struct transponder* createtransponder(uint64_t id, FE_QAM, int orbitalpos, TEST_S2_FREQ, int inversion, TEST_S2_SYMBOL, int polarization, int fec, int modulation, int rolloff, int pilot, int system);                       
                         }
                         
-                        if(ostrcmp(mbox->name, "Front Display") == 0)
+                        if(ostrcmp(mbox->name, _("Front Display")) == 0)
                         {
                                 int i = 0;
@@ -237 +237 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "Front Key") == 0)
+                        if(ostrcmp(mbox->name, _("Front Key")) == 0)
                         {
                                 char* tmpload = ostrcat(load->text, NULL, 0, 0);
@@ -265 +265 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "Color Bar") == 0)
+                        if(ostrcmp(mbox->name, _("Color Bar")) == 0)
                         {
                                 char* tmpstr = NULL;
@@ -303 +303 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "SCART 4:3 / 16:9") == 0)
+                        if(ostrcmp(mbox->name, _("SCART 4:3 / 16:9")) == 0)
                         {
                                 char* tmpload = ostrcat(load->text, NULL, 0, 0);
@@ -327 +327 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "Smartcard") == 0)
+                        if(ostrcmp(mbox->name, _("Smartcard")) == 0)
                         {
                                 uint32_t status = 0;
@@ -392 +392 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "Network") == 0)
+                        if(ostrcmp(mbox->name, _("Network")) == 0)
                         {
                                 struct inetwork* inode = inetwork;
@@ -412 +412 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "USB Port") == 0)
+                        if(ostrcmp(mbox->name, _("USB Port")) == 0)
                         {
                                 int usbcount = 0, found = 0, i = 0;
@@ -456 +456 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "CAM") == 0)
+                        if(ostrcmp(mbox->name, _("CAM")) == 0)
                         {
                                 int cicount = 0;
@@ -493 +493 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "RS232") == 0)
+                        if(ostrcmp(mbox->name, _("RS232")) == 0)
                         {
                                 int exist = 1, count = 0, okA = 0, okB = 0, okC = 0, okD = 0;
@@ -565 +565 @@
                         }
                         
-                        if(ostrcmp(mbox->name, "LNB") == 0)
+                        if(ostrcmp(mbox->name, _("LNB")) == 0)
                         {
                                 char* tmpstr = NULL;
@@ -610 +610 @@
                                 clearscreen(load);      
                         }
-                        if(ostrcmp(mbox->name, "Flash/Nand Check") == 0)
+                        if(ostrcmp(mbox->name, _("Flash/Nand Check")) == 0)
                         {
                                 int ret1 = 0, ret2 = 0, i = 0;

titan/titan/titan.c

@@ -865 +865 @@
                 {
                         struct menulist* mlist = NULL, *mbox = NULL;
-                        addmenulist(&mlist, "RemoteControl Old Version", "0", NULL, 0, 0);
-                        addmenulist(&mlist, "RemoteControl Long Version", "1", NULL, 0, 0);
+                        addmenulist(&mlist, _("RemoteControl Old Version"), "0", NULL, 0, 0);
+                        addmenulist(&mlist, _("RemoteControl Long Version"), "1", NULL, 0, 0);
                         
-                        mbox = menulistbox(mlist, "remotecontrol", "Select Your Remote Control", NULL, NULL, 3, 0);
+                        mbox = menulistbox(mlist, "remotecontrol", _("Select Your Remote Control"), NULL, NULL, 3, 0);
                         if(mbox != NULL)
                         {