Ignore:
Timestamp:
May 13, 2006, 8:47:23 PM (13 years ago)
Author:
bcornec
Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/mondo/common/newt-specific.c

    r502 r541  
    118118#include "libmondo-tools-EXT.h"
    119119#include "libmondo-fork-EXT.h"
    120 #include "newt-specific-EXT.h"
     120#include "libmondo-gui-EXT.h"
     121#include "lib-common-externs.h"
    121122
    122123/*@unused@*/
     
    226227                    tmp[i - 1] = '\0';
    227228                }
    228                 if (strstr(_("yesYES"), tmp)) {
     229                if (strstr("yesYES", tmp)) {
    229230                    paranoid_free(tmp);
    230231                    return (TRUE);
    231                 } else if (strstr(_("NOno"), tmp)) {
     232                } else if (strstr("NOno", tmp)) {
    232233                    paranoid_free(tmp);
    233234                    return (FALSE);
     
    235236                    system("sync");
    236237                    printf
    237                         (_("Please enter either YES or NO (or yes or no, or y or n, or...)\n"));
     238                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
    238239                }
    239240            }
    240241        } else {
    241242            paranoid_free(tmp);
    242             return (popup_with_buttons(prompt, _("Yes"), _("No")));
     243            return (popup_with_buttons(prompt, "Yes", "No"));
    243244        }
    244245    }
     
    272273                tmp[i - 1] = '\0';
    273274            }
    274             if (strstr(_("okOKOkYESyes"), tmp)) {
     275            if (strstr("okOKOkYESyes", tmp)) {
    275276                paranoid_free(tmp);
    276277                return (TRUE);
     
    281282        } else {
    282283            paranoid_free(tmp);
    283             return (popup_with_buttons(prompt, _(" Okay "), _("Cancel")));
     284            return (popup_with_buttons(prompt, " Okay ", "Cancel"));
    284285        }
    285286    }
     
    425426            ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
    426427        printf
    427                 (_("If you require technical support, please contact the mailing list.\n"));
    428         printf(_("See http://www.mondorescue.org for details.\n"));
     428                ("If you require technical support, please contact the mailing list.\n");
     429        printf("See http://www.mondorescue.org for details.\n");
    429430        printf
    430                 (_("The list's members can help you, if you attach that file to your e-mail.\n"));
    431         printf(_("Log file: %s\n"), MONDO_LOGFILE);
     431                ("The list's members can help you, if you attach that file to your e-mail.\n");
     432        printf("Log file: %s\n", MONDO_LOGFILE);
    432433        if (does_file_exist("/tmp/MA.log.gz")) {
    433434            printf
    434                 (_("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n"));
    435         }
    436         printf(_("Mondo has aborted.\n"));
     435                ("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
     436        }
     437        printf("Mondo has aborted.\n");
    437438        register_pid(0, "mondo");   // finish() does this too, FYI
    438439        if (!g_main_pid) {
     
    489490//  system("clear");
    490491//  iamhere("Finished calling newtFinished");
    491         printf(_("Execution run ended; result=%d\n"), signal);
    492         printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
     492        printf("Execution run ended; result=%d\n", signal);
     493        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
    493494        free_libmondo_global_strings();
    494495        exit(signal);
     
    782783            while (((ch = getchar()) != '\n') && (ch != EOF));
    783784        } else {
    784             (void) popup_with_buttons(prompt, _(" OK "), "");
     785            (void) popup_with_buttons(prompt, " OK ", "");
    785786        }
    786787    }
     
    842843#endif
    843844            );
    844         b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
    845         b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, _("Cancel"));
     845        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
     846        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
    846847        //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
    847848        newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
     
    930931        }
    931932        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
    932         newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, _("Alert"));
     933        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
    933934        myForm = newtForm(NULL, NULL, 0);
    934935        newtFormAddComponents(myForm, text, b_1, b_2, NULL);
     
    996997            newtCls();
    997998            newtPushHelpLine
    998                 (_("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed."));
     999                ("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed.");
    9991000            /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
    10001001            newtDrawRootText(18, 0, WELCOME_STRING);
     
    10741075            g_isoform_old_progress = percentage;
    10751076            sprintf(timeline_str,
    1076                     _("%2ld:%02ld taken            %2ld:%02ld remaining"),
     1077                    "%2ld:%02ld taken            %2ld:%02ld remaining",
    10771078                    time_taken / 60, time_taken % 60, time_remaining / 60,
    10781079                    time_remaining % 60);
    10791080            if (percentage < 3) {
    1080                 sprintf(pcline_str, _(" Working"));
     1081                sprintf(pcline_str, " Working");
    10811082                for (j = 0; j < g_mysterious_dot_counter; j++) {
    10821083                    strcat(pcline_str, ".");
     
    10881089                        special_dot_char(g_mysterious_dot_counter));
    10891090            } else {
    1090                 sprintf(pcline_str, _(" %3d%% done              %3d%% to go"),
     1091                sprintf(pcline_str, " %3d%% done              %3d%% to go",
    10911092                        percentage, 100 - percentage);
    10921093            }
     
    12341235
    12351236        if (g_text_mode) {
    1236             printf(_("---progress-form---1--- %s%s"), blurb1, "\r\n");
    1237             printf(_("---progress-form---2--- %s%s"), blurb2, "\r\n");
    1238             printf(_("---progress-form---3--- %s%s"), blurb3, "\r\n");
    1239             printf(_("---progress-form---E---\n"));
     1237            printf("---progress-form---1--- %s\r\n", blurb1);
     1238            printf("---progress-form---2--- %s\r\n", blurb2);
     1239            printf("---progress-form---3--- %s\r\n", blurb3);
     1240            printf("---progress-form---E---\n");
    12401241            sprintf(taskprogress, "TASK:  [");
    12411242            for (i = 0; i < percentage; i += 5) {
     
    12461247            }
    12471248            if (percentage > 100) {
    1248                 log_msg(2, _("percentage = %d"), percentage);
     1249                log_msg(2, "percentage = %d", percentage);
    12491250            }
    12501251            sprintf(taskprogress + strlen(taskprogress),
    12511252                    "] %3d%c", percentage, '%');
    12521253            sprintf(taskprogress + strlen(taskprogress),
    1253                     _(" done; %2ld:%02ld to go"),
     1254                    " done; %2ld:%02ld to go",
    12541255                    time_remaining / 60, time_remaining % 60);
    1255             printf(_("---progress-form---4--- %s\r\n"), taskprogress);
     1256            printf("---progress-form---4--- %s\r\n", taskprogress);
    12561257        } else {
    12571258            center_string(blurb1, 54);
     
    13291330        if (g_text_mode) {
    13301331            for (backup_type = none; backup_type == none;) {
    1331                 printf(_("Backup type ("));
     1332                printf("Backup type (");
    13321333                for (i = 0; possible_responses[i]; i++) {
    13331334                    printf("%c%s", (i == 0) ? '\0' : ' ',
     
    13511352        if (restoring) {
    13521353            strcpy(title_sz,
    1353                    _("Please choose the backup media from which you want to read data."));
    1354             strcpy(minimsg_sz, _("Read from:"));
     1354                   "Please choose the backup media from which you want to read data.");
     1355            strcpy(minimsg_sz, "Read from:");
    13551356        } else {
    13561357            strcpy(title_sz,
    1357                    _("Please choose the backup media to which you want to archive data."));
    1358             strcpy(minimsg_sz, _("Backup to:"));
     1358                   "Please choose the backup media to which you want to archive data.");
     1359            strcpy(minimsg_sz, "Backup to:");
    13591360        }
    13601361        newtPushHelpLine(title_sz);
    13611362        //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
    13621363        newtCenteredWindow(34, 17, minimsg_sz);
    1363         b1 = newtButton(1, 1, _("CD-R disks "));
    1364         b2 = newtButton(17, 1, _("CD-RW disks"));
    1365         b3 = newtButton(1, 9, _("Tape drive "));
    1366         b4 = newtButton(17, 5, _("CD streamer"));
    1367         b5 = newtButton(1, 5, _(" DVD disks "));
    1368         b6 = newtButton(17, 9, _(" NFS mount "));
    1369         b7 = newtButton(1, 13, _(" Hard disk "));
    1370         b8 = newtButton(17, 13, _("    Exit   "));
     1364        b1 = newtButton(1, 1, "CD-R disks ");
     1365        b2 = newtButton(17, 1, "CD-RW disks");
     1366        b3 = newtButton(1, 9, "Tape drive ");
     1367        b4 = newtButton(17, 5, "CD streamer");
     1368        b5 = newtButton(1, 5, " DVD disks ");
     1369        b6 = newtButton(17, 9, " NFS mount ");
     1370        b7 = newtButton(1, 13, " Hard disk ");
     1371        b8 = newtButton(17, 13, "    Exit   ");
    13711372        myForm = newtForm(NULL, NULL, 0);
    13721373        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
     
    14261427        newtDrawRootText(18, 0, WELCOME_STRING);
    14271428        newtPushHelpLine
    1428             (_("   Please specify the level of compression that you want."));
     1429            ("   Please specify the level of compression that you want.");
    14291430        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
    1430         newtCenteredWindow(34, 13, _("How much compression?"));
    1431         b1 = newtButton(4, 1, _("Maximum"));
    1432         b2 = newtButton(18, 1, _("Average"));
    1433         b3 = newtButton(4, 5, _("Minimum"));
    1434         b4 = newtButton(18, 5, _(" None  "));
    1435         b5 = newtButton(4, 9, _("         Exit        "));
     1431        newtCenteredWindow(34, 13, "How much compression?");
     1432        b1 = newtButton(4, 1, "Maximum");
     1433        b2 = newtButton(18, 1, "Average");
     1434        b3 = newtButton(4, 5, "Minumum");
     1435        b4 = newtButton(18, 5, " None  ");
     1436        b5 = newtButton(4, 9, "         Exit        ");
    14361437        myForm = newtForm(NULL, NULL, 0);
    14371438        newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
     
    15141515        paranoid_fclose(fin);
    15151516        if (filelist->entries >= ARBITRARY_MAXIMUM) {
    1516             log_to_screen(_("Arbitrary limits suck, man!"));
     1517            log_to_screen("Arbitrary limits suck, man!");
    15171518            paranoid_free(tmp);
    15181519            return (1);
     
    16561657        }
    16571658        sprintf(differ_sz,
    1658                 _("  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
     1659                "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
    16591660                i);
    16601661        newtPushHelpLine(differ_sz);
    1661         bClose = newtCompactButton(10, 15, _(" Close  "));
    1662         bSelect = newtCompactButton(30, 15, _(" Select "));
    1663         sprintf(tmp, "%-10s               %-20s", _("Priority"), _("Filename"));
     1662        bClose = newtCompactButton(10, 15, " Close  ");
     1663        bSelect = newtCompactButton(30, 15, " Select ");
     1664        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
    16641665        headerMsg = newtLabel(2, 1, tmp);
    1665         newtOpenWindow(5, 4, 70, 16, _("Non-matching files"));
     1666        newtOpenWindow(5, 4, 70, 16, "Non-matching files");
    16661667        myForm = newtForm(NULL, NULL, 0);
    16671668        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
     
    16771678                     i++);
    16781679                if (i == filelist->entries && filelist->entries > 0) {
    1679                     log_to_screen(_("I don't know what that button does!"));
     1680                    log_to_screen("I don't know what that button does!");
    16801681                } else {
    16811682                    currline = i;
Note: See TracChangeset for help on using the changeset viewer.