Menu
▾
▴
[Evms-cvs-commits] evms2/engine/plugins/reiser reiserfs.c,1.48,1.49
|
From: Steve D. <ste...@us...> - 2004-07-29 21:25:22
|
Update of /cvsroot/evms/evms2/engine/plugins/reiser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30678/plugins/reiser Modified Files: reiserfs.c Log Message: Initial tagging of messages that should be translated Some rework of messages to adhere to translation requirements Index: reiserfs.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/reiser/reiserfs.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- reiserfs.c 29 Jul 2004 17:50:03 -0000 1.48 +++ reiserfs.c 29 Jul 2004 21:24:42 -0000 1.49 @@ -314,7 +314,7 @@ bytes_read = read(fds2[0],buffer,MAX_USER_MESSAGE_LEN); if (bytes_read > 0) { write(fds1[1], "\n",1); // send newline to take default - MESSAGE("fsck output: \n%s",buffer); // on prompt if there is one + MESSAGE(_("fsck output: \n%s"),buffer); // on prompt if there is one memset(buffer,0,bytes_read); //clear out message } usleep(10000); // don't hog all the cpu @@ -323,7 +323,7 @@ do { bytes_read = read(fds2[0],buffer,MAX_USER_MESSAGE_LEN); if (bytes_read > 0) { - MESSAGE("fsck output: \n\n%s",buffer); + MESSAGE(_("fsck output: \n\n%s"),buffer); } } while (bytes_read > 0); LOG_DEFAULT("fsck completed with rc = %d \n",status); @@ -777,13 +777,13 @@ LOG_ENTRY(); if (!reiser_version) { - MESSAGE("ReiserFS utils were either not found or not at the " - "proper version. The fsck and mkfs utilities must be " - "installed using the standard names of mkreiserfs and " - "reiserfsck. ReiserFS utils must be version 3.x.0 or " - "later to function properly with this FSIM.Please get " - "the current version of ReiserFS utils from " - "http://www.namesys.com\n"); + MESSAGE(_("ReiserFS utils were either not found or not at the " + "proper version. The fsck and mkfs utilities must be " + "installed using the standard names of mkreiserfs and " + "reiserfsck. ReiserFS utils must be version 3.x.0 or " + "later to function properly with this FSIM.Please get " + "the current version of ReiserFS utils from " + "http://www.namesys.com\n")); LOG_EXIT_INT(E_CANCELED); return E_CANCELED; } @@ -826,7 +826,7 @@ while (!(waitpid( pidf, &status, WNOHANG ))) { bytes_read = read(fds2[0],buffer,MAX_USER_MESSAGE_LEN); if (bytes_read > 0) { - MESSAGE("expand output: \n\n%s",buffer); + MESSAGE(_("expand output: \n\n%s"),buffer); memset(buffer,0,bytes_read); //clear out message } usleep(10000); // don't hog all the cpu @@ -834,7 +834,7 @@ // do final read, just in case we missed some bytes_read = read(fds2[0],buffer,MAX_USER_MESSAGE_LEN); if (bytes_read > 0) { - MESSAGE("expand output: \n\n%s",buffer); + MESSAGE(_("expand output: \n\n%s"),buffer); } if ( WIFEXITED(status) ) { /* get expand exit code */ @@ -921,13 +921,13 @@ LOG_ENTRY(); if (!reiser_version) { - MESSAGE("ReiserFS utils were either not found or not at the " - "proper version. The fsck and mkfs utilities must be " - "installed using the standard names of mkreiserfs and " - "reiserfsck. ReiserFS utils must be version 3.x.0 or " - "later to function properly with this FSIM. Please get " - "the current version of ReiserFS utils from " - "http://www.namesys.com\n"); + MESSAGE(_("ReiserFS utils were either not found or not at the " + "proper version. The fsck and mkfs utilities must be " + "installed using the standard names of mkreiserfs and " + "reiserfsck. ReiserFS utils must be version 3.x.0 or " + "later to function properly with this FSIM. Please get " + "the current version of ReiserFS utils from " + "http://www.namesys.com\n")); LOG_EXIT_INT(E_CANCELED); return E_CANCELED; } @@ -981,7 +981,7 @@ while (!(waitpid( pidf, &status, WNOHANG ))) { bytes_read = read(fds2[0],buffer,MAX_USER_MESSAGE_LEN); if (bytes_read > 0) { - MESSAGE("Shrink output: \n%s",buffer); + MESSAGE(_("Shrink output: \n%s"),buffer); memset(buffer,0,bytes_read); //clear out message } usleep(10000); // don't hog all the cpu @@ -989,7 +989,7 @@ // do final read, just in case we missed some bytes_read = read(fds2[0],buffer,MAX_USER_MESSAGE_LEN); if (bytes_read > 0) { - MESSAGE("Shrink output: \n%s",buffer); + MESSAGE(_("Shrink output: \n%s"),buffer); } if ( WIFEXITED(status) ) { /* get shrink exit code */ @@ -1030,13 +1030,13 @@ return rc; } if (!reiser_version) { - MESSAGE("ReiserFS utils were either not found or not at the " - "proper version. The fsck and mkfs utilities must be " - "installed using the standard names of mkreiserfs and " - "reiserfsck. ReiserFS utils must be version 3.x.0 or " - "later to function properly with this FSIM. Please get " - "the current version of ReiserFS utils from " - "http://www.namesys.com\n"); + MESSAGE(_("ReiserFS utils were either not found or not at the " + "proper version. The fsck and mkfs utilities must be " + "installed using the standard names of mkreiserfs and " + "reiserfsck. ReiserFS utils must be version 3.x.0 or " + "later to function properly with this FSIM. Please get " + "the current version of ReiserFS utils from " + "http://www.namesys.com\n")); LOG_EXIT_INT(E_CANCELED); return E_CANCELED; } @@ -1078,13 +1078,13 @@ LOG_ENTRY(); if (!reiser_version) { - MESSAGE("ReiserFS utils were either not found or not at the " - "proper version. The fsck and mkfs utilities must be " - "installed using the standard names of mkreiserfs and " - "reiserfsck. ReiserFS utils must be version 3.x.0 or " - "later to function properly with this FSIM. Please get " - "the current version of ReiserFS utils from " - "http://www.namesys.com\n"); + MESSAGE(_("ReiserFS utils were either not found or not at the " + "proper version. The fsck and mkfs utilities must be " + "installed using the standard names of mkreiserfs and " + "reiserfsck. ReiserFS utils must be version 3.x.0 or " + "later to function properly with this FSIM. Please get " + "the current version of ReiserFS utils from " + "http://www.namesys.com\n")); LOG_EXIT_INT(E_CANCELED); return E_CANCELED; } @@ -1111,9 +1111,10 @@ * and errors were found, let the user know how to fix them. */ if (EngFncs->is_mounted(volume->dev_node, NULL) && rc) { - MESSAGE( "%s is mounted.", volume->dev_node ); - MESSAGE( "reiserfsck (fsck.reiserfs) checked the volume READ ONLY and found errors but did not fix them." ); - MESSAGE( "Unmount %s and run reiserfsck (fsck.reiserfs) again to repair the file system.", volume->dev_node ); + MESSAGE( _("%s is mounted." + "reiserfsck (fsck.reiserfs) checked the volume READ ONLY and found errors but did not fix them." + "Unmount %s and run reiserfsck (fsck.reiserfs) again to repair the file system."), + volume->dev_node, volume->dev_node ); } LOG_EXIT_INT(rc); @@ -1220,14 +1221,14 @@ } if (!reiser_version) { - MESSAGE("ReiserFS utils were either not found or not " - "at the proper version. The fsck and mkfs " - "utilities must be installed using the " - "standard names of mkreiserfs and reiserfsck. " - "ReiserFS utils must be version 3.x.0 or " - "later to function properly with this FSIM. " - "Please get the current version of ReiserFS " - "utils from http://www.namesys.com\n"); + MESSAGE(_("ReiserFS utils were either not found or not " + "at the proper version. The fsck and mkfs " + "utilities must be installed using the " + "standard names of mkreiserfs and reiserfsck. " + "ReiserFS utils must be version 3.x.0 or " + "later to function properly with this FSIM. " + "Please get the current version of ReiserFS " + "utils from http://www.namesys.com\n")); rc = E_CANCELED; break; } @@ -1237,8 +1238,8 @@ context->option_descriptors->count = MKFS_OPTIONS_COUNT; /* Set version display option */ context->option_descriptors->option[MKFS_VERSION_INDEX].name = EngFncs->engine_strdup("version" ); - context->option_descriptors->option[MKFS_VERSION_INDEX].title = EngFncs->engine_strdup("Version of mkreiserfs" ); - context->option_descriptors->option[MKFS_VERSION_INDEX].tip = EngFncs->engine_strdup("Informational only: this is the current version of ResierFS utitlities found on your system." ); + context->option_descriptors->option[MKFS_VERSION_INDEX].title = EngFncs->engine_strdup(_("Version of mkreiserfs")); + context->option_descriptors->option[MKFS_VERSION_INDEX].tip = EngFncs->engine_strdup(_("Informational only: this is the current version of ResierFS utitlities found on your system.")); context->option_descriptors->option[MKFS_VERSION_INDEX].help = NULL; context->option_descriptors->option[MKFS_VERSION_INDEX].type = EVMS_Type_String; context->option_descriptors->option[MKFS_VERSION_INDEX].unit = EVMS_Unit_None; @@ -1252,8 +1253,8 @@ /* Set Volume Label option */ context->option_descriptors->option[MKFS_SETVOL_INDEX].name = EngFncs->engine_strdup("vollabel" ); - context->option_descriptors->option[MKFS_SETVOL_INDEX].title = EngFncs->engine_strdup("Volume Label" ); - context->option_descriptors->option[MKFS_SETVOL_INDEX].tip = EngFncs->engine_strdup("Set the volume label for the file system." ); + context->option_descriptors->option[MKFS_SETVOL_INDEX].title = EngFncs->engine_strdup(_("Volume Label")); + context->option_descriptors->option[MKFS_SETVOL_INDEX].tip = EngFncs->engine_strdup(_("Set the volume label for the file system.")); context->option_descriptors->option[MKFS_SETVOL_INDEX].help = NULL; context->option_descriptors->option[MKFS_SETVOL_INDEX].type = EVMS_Type_String; context->option_descriptors->option[MKFS_SETVOL_INDEX].unit = EVMS_Unit_None; @@ -1268,8 +1269,8 @@ /* Log size option */ context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].name = EngFncs->engine_strdup("logsize" ); - context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].title = EngFncs->engine_strdup("Log Size" ); - context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].tip = EngFncs->engine_strdup("Set log size (in kilobytes). Default log size is 8193 4k Blocks." ); + context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].title = EngFncs->engine_strdup(_("Log Size")); + context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].tip = EngFncs->engine_strdup(_("Set log size (in kilobytes). Default log size is 8193 4k Blocks.")); context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].help = NULL; context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].type = EVMS_Type_Unsigned_Int32; context->option_descriptors->option[MKFS_SETLOGSIZE_INDEX].unit = EVMS_Unit_Kilobytes; @@ -1292,14 +1293,14 @@ case EVMS_Task_fsck: if (!reiser_version) { - MESSAGE("ReiserFS utils were either not found or not " - "at the proper version. The fsck and mkfs " - "utilities must be installed using the " - "standard names of mkreiserfs and " - "reiserfsck. ReiserFS utils must be version " - "3.x.0 or later to function properly with this " - "FSIM. Please get the current version of " - "ReiserFS utils from http://www.namesys.com\n"); + MESSAGE(_("ReiserFS utils were either not found or not " + "at the proper version. The fsck and mkfs " + "utilities must be installed using the " + "standard names of mkreiserfs and " + "reiserfsck. ReiserFS utils must be version " + "3.x.0 or later to function properly with this " + "FSIM. Please get the current version of " + "ReiserFS utils from http://www.namesys.com\n")); rc = E_CANCELED; break; } @@ -1315,12 +1316,12 @@ if (value_list) { if (EngFncs->is_mounted(context->volume->dev_node, NULL)) { value_list->count = 1; - value_list->value[0].s = EngFncs->engine_strdup("Check Read-Only"); + value_list->value[0].s = EngFncs->engine_strdup(_("Check Read-Only")); } else { value_list->count = 3; - value_list->value[0].s = EngFncs->engine_strdup("Check Read-Only"); - value_list->value[1].s = EngFncs->engine_strdup("Fix"); - value_list->value[2].s = EngFncs->engine_strdup("Rebuild Tree"); + value_list->value[0].s = EngFncs->engine_strdup(_("Check Read-Only")); + value_list->value[1].s = EngFncs->engine_strdup(_("Fix")); + value_list->value[2].s = EngFncs->engine_strdup(_("Rebuild Tree")); } } else { LOG_EXIT_INT(rc); @@ -1328,9 +1329,9 @@ } /* MODE option */ - context->option_descriptors->option[FSCK_MODE_INDEX].name = EngFncs->engine_strdup("mode" ); - context->option_descriptors->option[FSCK_MODE_INDEX].title = EngFncs->engine_strdup("Mode" ); - context->option_descriptors->option[FSCK_MODE_INDEX].tip = EngFncs->engine_strdup("Mode of operation" ); + context->option_descriptors->option[FSCK_MODE_INDEX].name = EngFncs->engine_strdup("mode"); + context->option_descriptors->option[FSCK_MODE_INDEX].title = EngFncs->engine_strdup(_("Mode")); + context->option_descriptors->option[FSCK_MODE_INDEX].tip = EngFncs->engine_strdup(_("Mode of operation")); context->option_descriptors->option[FSCK_MODE_INDEX].help = NULL; context->option_descriptors->option[FSCK_MODE_INDEX].max_len = EVMS_VOLUME_NAME_SIZE; context->option_descriptors->option[FSCK_MODE_INDEX].min_len = 1; @@ -1418,7 +1419,7 @@ if (EngFncs->is_mounted(context->volume->dev_node, NULL)) { if (!(strcmp(value->s,FSCK_FIX)) || !(strcmp(value->s,FSCK_REBUILD_TREE))) { strcpy(context->option_descriptors->option[FSCK_MODE_INDEX].value.s,FSCK_READONLY); - MESSAGE("Only Check mode is alllowed when the volume is mounted."); + MESSAGE(_("Only Check mode is alllowed when the volume is mounted.")); *effect |= EVMS_Effect_Reload_Options; } } else { @@ -1427,10 +1428,10 @@ strcpy(context->option_descriptors->option[FSCK_MODE_INDEX].value.s,value->s); } if (strcmp(value->s,FSCK_READONLY)) { - MESSAGE("Selecting a mode other than read only will cause " - "default responses to be given to any questions asked by the reiserfsck (fsck.reiserfs) " - "utitlity. If you do not wish to run in this mode, you must run reiserfsck (fsck.reiserfs) " - "from the command line."); + MESSAGE(_("Selecting a mode other than read only will cause " + "default responses to be given to any questions asked by the reiserfsck (fsck.reiserfs) " + "utitlity. If you do not wish to run in this mode, you must run reiserfsck (fsck.reiserfs) " + "from the command line.")); } } break; @@ -1480,8 +1481,12 @@ rc = EBUSY; } else { if ( vol->vol_size < MINREISERFS) { - MESSAGE( "The size of volume %s is %"PRIu64" bytes.", vol->name, vol->vol_size << EVMS_VSECTOR_SIZE_SHIFT ); - MESSAGE( "mkfs.reiserfs requires a minimum of %u bytes to build the ReiserFS file system.", MINREISERFS ); + char number_buffer[64]; + + sprintf(number_buffer, "%"PRIu64, vol->vol_size << EVMS_VSECTOR_SIZE_SHIFT ); + MESSAGE( _("The size of volume %s is %s bytes. " + "mkfs.reiserfs requires a minimum of %u bytes to build the ReiserFS file system."), + vol->name, number_buffer, MINREISERFS ); rc = EPERM; } } @@ -1546,8 +1551,8 @@ Info->count = 5; Info->info[0].name = EngFncs->engine_strdup( "MagicNumber" ); - Info->info[0].title = EngFncs->engine_strdup( "Magic Number" ); - Info->info[0].desc = EngFncs->engine_strdup( "Magic Number"); + Info->info[0].title = EngFncs->engine_strdup( _("Magic Number") ); + Info->info[0].desc = EngFncs->engine_strdup( _("Magic Number") ); Info->info[0].type = EVMS_Type_String; Info->info[0].unit = EVMS_Unit_None; Info->info[0].value.s = EngFncs->engine_strdup(sb_ptr->s_v1.s_magic); @@ -1555,8 +1560,8 @@ memset( &Info->info[0].group, 0, sizeof(group_info_t)); Info->info[1].name = EngFncs->engine_strdup( "Version" ); - Info->info[1].title = EngFncs->engine_strdup( "Version Number" ); - Info->info[1].desc = EngFncs->engine_strdup( "Version Number"); + Info->info[1].title = EngFncs->engine_strdup( _("Version Number") ); + Info->info[1].desc = EngFncs->engine_strdup( _("Version Number") ); Info->info[1].type = EVMS_Type_Unsigned_Int16; Info->info[1].unit = EVMS_Unit_None; Info->info[1].value.ui16 = get_sb_version(sb_ptr); @@ -1564,8 +1569,8 @@ memset( &Info->info[1].group, 0, sizeof(group_info_t)); Info->info[2].name = EngFncs->engine_strdup( "VolLabel" ); - Info->info[2].title = EngFncs->engine_strdup( "Volume Label" ); - Info->info[2].desc = EngFncs->engine_strdup( "File system volume label"); + Info->info[2].title = EngFncs->engine_strdup( _("Volume Label") ); + Info->info[2].desc = EngFncs->engine_strdup( _("File system volume label") ); Info->info[2].type = EVMS_Type_String; Info->info[2].unit = EVMS_Unit_None; Info->info[2].value.s = EngFncs->engine_strdup(sb_ptr->s_label); @@ -1573,8 +1578,8 @@ memset( &Info->info[2].group, 0, sizeof(group_info_t)); Info->info[3].name = EngFncs->engine_strdup( "UsableSize" ); - Info->info[3].title = EngFncs->engine_strdup( "File System Size" ); - Info->info[3].desc = EngFncs->engine_strdup( "Size of the file system (not including journal)"); + Info->info[3].title = EngFncs->engine_strdup( _("File System Size") ); + Info->info[3].desc = EngFncs->engine_strdup( _("Size of the file system (not including journal)") ); Info->info[3].type = EVMS_Type_Unsigned_Int64; Info->info[3].unit = EVMS_Unit_Sectors; Info->info[3].value.ui64 = (get_sb_block_count(sb_ptr) @@ -1583,8 +1588,8 @@ memset( &Info->info[3].group, 0, sizeof(group_info_t)); Info->info[4].name = EngFncs->engine_strdup( "LogSize" ); - Info->info[4].title = EngFncs->engine_strdup( "Journal Size" ); - Info->info[4].desc = EngFncs->engine_strdup( "Size of the file system journal"); + Info->info[4].title = EngFncs->engine_strdup( _("Journal Size") ); + Info->info[4].desc = EngFncs->engine_strdup( _("Size of the file system journal") ); Info->info[4].type = EVMS_Type_Unsigned_Int64; Info->info[4].unit = EVMS_Unit_Sectors; Info->info[4].value.ui64 = get_jp_journal_size(sb_ptr) * (get_sb_block_size(sb_ptr)/EVMS_VSECTOR_SIZE); @@ -1649,8 +1654,8 @@ my_plugin_record->required_plugin_api_version.fsim.patchlevel ); Info->info[0].name = EngFncs->engine_strdup( "Short Name" ); - Info->info[0].title = EngFncs->engine_strdup( "Short Name" ); - Info->info[0].desc = EngFncs->engine_strdup( "A short name given to this plugin"); + Info->info[0].title = EngFncs->engine_strdup( _("Short Name") ); + Info->info[0].desc = EngFncs->engine_strdup( _("A short name given to this plug-in") ); Info->info[0].type = EVMS_Type_String; Info->info[0].unit = EVMS_Unit_None; Info->info[0].value.s = EngFncs->engine_strdup( my_plugin_record->short_name ); @@ -1658,8 +1663,8 @@ memset( &Info->info[0].group, 0, sizeof(group_info_t)); Info->info[1].name = EngFncs->engine_strdup( "Long Name" ); - Info->info[1].title = EngFncs->engine_strdup( "Long Name" ); - Info->info[1].desc = EngFncs->engine_strdup( "A long name given to this plugin"); + Info->info[1].title = EngFncs->engine_strdup( _("Long Name") ); + Info->info[1].desc = EngFncs->engine_strdup( _("A long name given to this plug-in") ); Info->info[1].type = EVMS_Type_String; Info->info[1].unit = EVMS_Unit_None; Info->info[1].value.s = EngFncs->engine_strdup( my_plugin_record->long_name ); @@ -1667,17 +1672,17 @@ memset( &Info->info[1].group, 0, sizeof(group_info_t)); Info->info[2].name = EngFncs->engine_strdup( "Type" ); - Info->info[2].title = EngFncs->engine_strdup( "Plugin Type" ); - Info->info[2].desc = EngFncs->engine_strdup( "There are various types of plugins; each responsible for some kind of storage object."); + Info->info[2].title = EngFncs->engine_strdup( _("Plug-in Type") ); + Info->info[2].desc = EngFncs->engine_strdup( _("There are various types of plug-ins, each responsible for some kind of storage object or logical volume.") ); Info->info[2].type = EVMS_Type_String; Info->info[2].unit = EVMS_Unit_None; - Info->info[2].value.s = EngFncs->engine_strdup( "File System Interface Module" ); + Info->info[2].value.s = EngFncs->engine_strdup( _("File System Interface Module") ); Info->info[2].collection_type = EVMS_Collection_None; memset( &Info->info[2].group, 0, sizeof(group_info_t)); Info->info[3].name = EngFncs->engine_strdup( "Version" ); - Info->info[3].title = EngFncs->engine_strdup( "Plugin Version" ); - Info->info[3].desc = EngFncs->engine_strdup( "This is the version number of the plugin."); + Info->info[3].title = EngFncs->engine_strdup( _("Plug-in Version") ); + Info->info[3].desc = EngFncs->engine_strdup( _("This is the version number of the plug-in.")); Info->info[3].type = EVMS_Type_String; Info->info[3].unit = EVMS_Unit_None; Info->info[3].value.s = EngFncs->engine_strdup( version_string ); @@ -1685,8 +1690,8 @@ memset( &Info->info[3].group, 0, sizeof(group_info_t)); Info->info[4].name = EngFncs->engine_strdup( "Required Engine Services Version" ); - Info->info[4].title = EngFncs->engine_strdup( "Required Engine Services Version" ); - Info->info[4].desc = EngFncs->engine_strdup( "This is the version of the Engine services that this plug-in requires. It will not run on older versions of the Engine services."); + Info->info[4].title = EngFncs->engine_strdup( _("Required Engine Services Version") ); + Info->info[4].desc = EngFncs->engine_strdup( _("This is the version of the Engine services that this plug-in requires. It will not run on older versions of the Engine services.") ); Info->info[4].type = EVMS_Type_String; Info->info[4].unit = EVMS_Unit_None; Info->info[4].value.s = EngFncs->engine_strdup( required_engine_api_version_string ); @@ -1694,8 +1699,8 @@ memset( &Info->info[4].group, 0, sizeof(group_info_t)); Info->info[5].name = EngFncs->engine_strdup( "Required Engine FSIM API Version" ); - Info->info[5].title = EngFncs->engine_strdup( "Required Engine FSIM API Version" ); - Info->info[5].desc = EngFncs->engine_strdup( "This is the version of the Engine FSIM API that this plug-in requires. It will not run on older versions of the Engine FSIM API."); + Info->info[5].title = EngFncs->engine_strdup( _("Required Engine FSIM API Version") ); + Info->info[5].desc = EngFncs->engine_strdup( _("This is the version of the Engine FSIM API that this plug-in requires. It will not run on older versions of the Engine FSIM API.") ); Info->info[5].type = EVMS_Type_String; Info->info[5].unit = EVMS_Unit_None; Info->info[5].value.s = EngFncs->engine_strdup( required_fsim_api_version_string ); |