diff options
author | Julien Lavergne <gilir@ubuntu.com> | 2013-01-05 16:18:38 +0100 |
---|---|---|
committer | Leandro Pereira <leandro@hardinfo.org> | 2014-01-03 08:02:30 -0200 |
commit | eb77158796dbf5f3ce395f5b85a2d0f78038fa00 (patch) | |
tree | fd3e5bc8281922378b388020f662871aeb60d805 /modules | |
parent | ba24b32ccaaf44f683ffe35cd4ac4ddf61c8da06 (diff) |
Add initial translation support (patch from rodin.s)
Diffstat (limited to 'modules')
-rw-r--r-- | modules/benchmark.c | 48 | ||||
-rw-r--r-- | modules/computer.c | 119 | ||||
-rw-r--r-- | modules/computer/alsa.c | 4 | ||||
-rw-r--r-- | modules/computer/boots.c | 2 | ||||
-rw-r--r-- | modules/computer/display.c | 8 | ||||
-rw-r--r-- | modules/computer/environment.c | 2 | ||||
-rw-r--r-- | modules/computer/loadavg.c | 1 | ||||
-rw-r--r-- | modules/computer/os.c | 18 | ||||
-rw-r--r-- | modules/devices.c | 42 | ||||
-rw-r--r-- | modules/devices/battery.c | 16 | ||||
-rw-r--r-- | modules/devices/printers.c | 46 | ||||
-rw-r--r-- | modules/devices/storage.c | 38 | ||||
-rw-r--r-- | modules/network.c | 38 |
13 files changed, 191 insertions, 191 deletions
diff --git a/modules/benchmark.c b/modules/benchmark.c index fffc0864..5a252184 100644 --- a/modules/benchmark.c +++ b/modules/benchmark.c @@ -47,13 +47,13 @@ gchar *callback_nqueens(); gchar *callback_gui(); static ModuleEntry entries[] = { - {"CPU Blowfish", "blowfish.png", callback_bfsh, scan_bfsh, MODULE_FLAG_NONE}, - {"CPU CryptoHash", "cryptohash.png", callback_cryptohash, scan_cryptohash, MODULE_FLAG_NONE}, - {"CPU Fibonacci", "nautilus.png", callback_fib, scan_fib, MODULE_FLAG_NONE}, - {"CPU N-Queens", "nqueens.png", callback_nqueens, scan_nqueens, MODULE_FLAG_NONE}, - {"FPU FFT", "fft.png", callback_fft, scan_fft, MODULE_FLAG_NONE}, - {"FPU Raytracing", "raytrace.png", callback_raytr, scan_raytr, MODULE_FLAG_NONE}, - {"GPU Drawing", "module.png", callback_gui, scan_gui, MODULE_FLAG_NO_REMOTE}, + {N_("CPU Blowfish"), "blowfish.png", callback_bfsh, scan_bfsh, MODULE_FLAG_NONE}, + {N_("CPU CryptoHash"), "cryptohash.png", callback_cryptohash, scan_cryptohash, MODULE_FLAG_NONE}, + {N_("CPU Fibonacci"), "nautilus.png", callback_fib, scan_fib, MODULE_FLAG_NONE}, + {N_("CPU N-Queens"), "nqueens.png", callback_nqueens, scan_nqueens, MODULE_FLAG_NONE}, + {N_("FPU FFT"), "fft.png", callback_fft, scan_fft, MODULE_FLAG_NONE}, + {N_("FPU Raytracing"), "raytrace.png", callback_raytr, scan_raytr, MODULE_FLAG_NONE}, + {N_("GPU Drawing"), "module.png", callback_gui, scan_gui, MODULE_FLAG_NO_REMOTE}, {NULL} }; @@ -219,7 +219,7 @@ static gchar *__benchmark_include_results(gdouble result, if (result > 0.0f) { processor_frequency = module_call_method("devices::getProcessorFrequency"); - return_value = g_strdup_printf("[$ShellParam$]\n" + return_value = g_strdup_printf(_("[$ShellParam$]\n" "Zebra=1\n" "OrderType=%d\n" "ViewType=3\n" @@ -229,10 +229,10 @@ static gchar *__benchmark_include_results(gdouble result, "ShowColumnHeaders=true\n" "[%s]\n" "<big><b>This Machine</b></big>=%.3f|%s MHz\n" - "%s", order_type, benchmark, result, processor_frequency, results); + "%s"), order_type, benchmark, result, processor_frequency, results); g_free(processor_frequency); } else { - return_value = g_strdup_printf("[$ShellParam$]\n" + return_value = g_strdup_printf(_("[$ShellParam$]\n" "Zebra=1\n" "OrderType=%d\n" "ViewType=3\n" @@ -241,7 +241,7 @@ static gchar *__benchmark_include_results(gdouble result, "ColumnTitle$TextValue=CPU\n" "ShowColumnHeaders=true\n" "[%s]\n" - "%s", order_type, benchmark, results); + "%s"), order_type, benchmark, results); } return return_value; } @@ -360,7 +360,7 @@ static void do_benchmark(void (*benchmark_function)(void), int entry) GSpawnFlags spawn_flags = G_SPAWN_STDERR_TO_DEV_NULL; gchar *bench_status; - bench_status = g_strdup_printf("Benchmarking: <b>%s</b>.", entries[entry].name); + bench_status = g_strdup_printf(_("Benchmarking: <b>%s</b>."), entries[entry].name); shell_view_set_enabled(FALSE); shell_status_update(bench_status); @@ -374,11 +374,11 @@ static void do_benchmark(void (*benchmark_function)(void), int entry) GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, - "Benchmarking. Please do not move your mouse " \ - "or press any keys."); + _("Benchmarking. Please do not move your mouse " \ + "or press any keys.")); g_object_set_data(G_OBJECT(bench_dialog), "result", "0.0"); gtk_dialog_add_buttons(GTK_DIALOG(bench_dialog), - "Cancel", GTK_RESPONSE_ACCEPT, NULL); + _("Cancel"), GTK_RESPONSE_ACCEPT, NULL); gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(bench_dialog), bench_image); while (gtk_events_pending()) { @@ -428,7 +428,7 @@ static void do_benchmark(void (*benchmark_function)(void), int entry) shell_status_set_enabled(TRUE); g_free(benchmark_dialog); - shell_status_update("Done."); + shell_status_update(_("Done.")); return; } @@ -436,7 +436,7 @@ static void do_benchmark(void (*benchmark_function)(void), int entry) gtk_widget_destroy(bench_dialog); g_free(benchmark_dialog); shell_status_set_enabled(TRUE); - shell_status_update("Done."); + shell_status_update(_("Done.")); } setpriority(PRIO_PROCESS, 0, -20); @@ -508,17 +508,17 @@ const gchar *hi_note_func(gint entry) { switch (entry) { case BENCHMARK_CRYPTOHASH: - return "Results in MiB/second. Higher is better."; + return _("Results in MiB/second. Higher is better."); case BENCHMARK_GUI: - return "Results in HIMarks. Higher is better."; + return _("Results in HIMarks. Higher is better."); case BENCHMARK_FFT: case BENCHMARK_RAYTRACE: case BENCHMARK_BLOWFISH: case BENCHMARK_FIB: case BENCHMARK_NQUEENS: - return "Results in seconds. Lower is better."; + return _("Results in seconds. Lower is better."); } return NULL; @@ -526,7 +526,7 @@ const gchar *hi_note_func(gint entry) gchar *hi_module_get_name(void) { - return g_strdup("Benchmarks"); + return g_strdup(_("Benchmarks")); } guchar hi_module_get_weight(void) @@ -544,7 +544,7 @@ ModuleAbout *hi_module_get_about(void) static ModuleAbout ma[] = { { .author = "Leandro A. F. Pereira", - .description = "Perform tasks and compare with other systems", + .description = N_("Perform tasks and compare with other systems"), .version = VERSION, .license = "GNU GPL version 2"} }; @@ -631,12 +631,12 @@ void hi_module_init(void) { static SyncEntry se[] = { { - .fancy_name = "Send benchmark results", + .fancy_name = N_("Send benchmark results"), .name = "SendBenchmarkResults", .save_to = NULL, .get_data = get_benchmark_results}, { - .fancy_name = "Receive benchmark results", + .fancy_name = N_("Receive benchmark results"), .name = "RecvBenchmarkResults", .save_to = "benchmark.conf", .get_data = NULL} diff --git a/modules/computer.c b/modules/computer.c index cd015cf2..16c68217 100644 --- a/modules/computer.c +++ b/modules/computer.c @@ -65,19 +65,19 @@ void scan_dev(gboolean reload); #endif /* GLIB_CHECK_VERSION(2,14,0) */ static ModuleEntry entries[] = { - {"Summary", "summary.png", callback_summary, scan_summary, MODULE_FLAG_NONE}, - {"Operating System", "os.png", callback_os, scan_os, MODULE_FLAG_NONE}, - {"Kernel Modules", "module.png", callback_modules, scan_modules, MODULE_FLAG_NONE}, - {"Boots", "boot.png", callback_boots, scan_boots, MODULE_FLAG_NONE}, - {"Languages", "language.png", callback_locales, scan_locales, MODULE_FLAG_NONE}, - {"Filesystems", "dev_removable.png", callback_fs, scan_fs, MODULE_FLAG_NONE}, - {"Display", "monitor.png", callback_display, scan_display, MODULE_FLAG_NONE}, - {"Environment Variables", "environment.png", callback_env_var, scan_env_var, MODULE_FLAG_NONE}, + {N_("Summary"), "summary.png", callback_summary, scan_summary, MODULE_FLAG_NONE}, + {N_("Operating System"), "os.png", callback_os, scan_os, MODULE_FLAG_NONE}, + {N_("Kernel Modules"), "module.png", callback_modules, scan_modules, MODULE_FLAG_NONE}, + {N_("Boots"), "boot.png", callback_boots, scan_boots, MODULE_FLAG_NONE}, + {N_("Languages"), "language.png", callback_locales, scan_locales, MODULE_FLAG_NONE}, + {N_("Filesystems"), "dev_removable.png", callback_fs, scan_fs, MODULE_FLAG_NONE}, + {N_("Display"), "monitor.png", callback_display, scan_display, MODULE_FLAG_NONE}, + {N_("Environment Variables"), "environment.png", callback_env_var, scan_env_var, MODULE_FLAG_NONE}, #if GLIB_CHECK_VERSION(2,14,0) - {"Development", "devel.png", callback_dev, scan_dev, MODULE_FLAG_NONE}, + {N_("Development"), "devel.png", callback_dev, scan_dev, MODULE_FLAG_NONE}, #endif /* GLIB_CHECK_VERSION(2,14,0) */ - {"Users", "users.png", callback_users, scan_users, MODULE_FLAG_NONE}, - {"Groups", "users.png", callback_groups, scan_groups, MODULE_FLAG_NONE}, + {N_("Users"), "users.png", callback_users, scan_users, MODULE_FLAG_NONE}, + {N_("Groups"), "users.png", callback_groups, scan_groups, MODULE_FLAG_NONE}, {NULL}, }; @@ -96,11 +96,12 @@ gchar *hi_more_info(gchar * entry) gchar *hi_get_field(gchar * field) { + setlocale(LC_ALL, "C"); //Load Average is not updated if locale is not C, swithc locale to C gchar *tmp; if (g_str_equal(field, "Memory")) { MemoryInfo *mi = computer_get_memory(); - tmp = g_strdup_printf("%dMB (%dMB used)", mi->total, mi->used); + tmp = g_strdup_printf(_("%dMB (%dMB used)"), mi->total, mi->used); g_free(mi); } else if (g_str_equal(field, "Uptime")) { tmp = computer_get_formatted_uptime(); @@ -114,7 +115,7 @@ gchar *hi_get_field(gchar * field) } else { tmp = g_strdup(""); } - + setlocale(LC_ALL, "");// switch locale back to normal return tmp; } @@ -196,28 +197,28 @@ void scan_dev(gboolean reload) gchar *regex; gboolean stdout; } detect_lang[] = { - { "Scripting Languages", NULL, FALSE }, - { "CPython", "python -V", "\\d+\\.\\d+\\.\\d+", FALSE }, - { "Perl", "perl -v", "\\d+\\.\\d+\\.\\d+", TRUE }, - { "PHP", "php --version", "\\d+\\.\\d+\\.\\S+", TRUE}, - { "Ruby", "ruby --version", "\\d+\\.\\d+\\.\\d+", TRUE }, - { "Bash", "bash --version", "\\d+\\.\\d+\\.\\S+", TRUE}, - { "Compilers", NULL, FALSE }, - { "C (GCC)", "gcc -v", "\\d+\\.\\d+\\.\\d+", FALSE }, - { "C (Clang)", "clang -v", "\\d+\\.\\d+", FALSE }, - { "D (dmd)", "dmd --help", "\\d+\\.\\d+", TRUE }, - { "Java", "javac -version", "\\d+\\.\\d+\\.\\d+", FALSE }, - { "CSharp (Mono, old)", "mcs --version", "\\d+\\.\\d+\\.\\d+\\.\\d+", TRUE }, - { "CSharp (Mono)", "gmcs --version", "\\d+\\.\\d+\\.\\d+\\.\\d+", TRUE }, - { "Vala", "valac --version", "\\d+\\.\\d+\\.\\d+", TRUE }, - { "Haskell (GHC)", "ghc -v", "\\d+\\.\\d+\\.\\d+", FALSE }, - { "FreePascal", "fpc -iV", "\\d+\\.\\d+\\.?\\d*", TRUE }, - { "Tools", NULL, FALSE }, - { "make", "make --version", "\\d+\\.\\d+", TRUE }, - { "GDB", "gdb --version", "\\d+\\.\\S+", TRUE }, - { "strace", "strace -V", "\\d+\\.\\d+\\.?\\d*", TRUE }, - { "valgrind", "valgrind --version", "\\d+\\.\\d+\\.\\S+", TRUE }, - { "QMake", "qmake --version", "\\d+\\.\\S+", TRUE}, + { N_("Scripting Languages"), NULL, FALSE }, + { N_("CPython"), "python -V", "\\d+\\.\\d+\\.\\d+", FALSE }, + { N_("Perl"), "perl -v", "\\d+\\.\\d+\\.\\d+", TRUE }, + { N_("PHP"), "php --version", "\\d+\\.\\d+\\.\\S+", TRUE}, + { N_("Ruby"), "ruby --version", "\\d+\\.\\d+\\.\\d+", TRUE }, + { N_("Bash"), "bash --version", "\\d+\\.\\d+\\.\\S+", TRUE}, + { N_("Compilers"), NULL, FALSE }, + { N_("C (GCC)"), "gcc -v", "\\d+\\.\\d+\\.\\d+", FALSE }, + { N_("C (Clang)"), "clang -v", "\\d+\\.\\d+", FALSE }, + { N_("D (dmd)"), "dmd --help", "\\d+\\.\\d+", TRUE }, + { N_("Java"), "javac -version", "\\d+\\.\\d+\\.\\d+", FALSE }, + { N_("CSharp (Mono, old)"), "mcs --version", "\\d+\\.\\d+\\.\\d+\\.\\d+", TRUE }, + { N_("CSharp (Mono)"), "gmcs --version", "\\d+\\.\\d+\\.\\d+\\.\\d+", TRUE }, + { N_("Vala"), "valac --version", "\\d+\\.\\d+\\.\\d+", TRUE }, + { N_("Haskell (GHC)"), "ghc -v", "\\d+\\.\\d+\\.\\d+", FALSE }, + { N_("FreePascal"), "fpc -iV", "\\d+\\.\\d+\\.?\\d*", TRUE }, + { N_("Tools"), NULL, FALSE }, + { N_("make"), "make --version", "\\d+\\.\\d+", TRUE }, + { N_("GDB"), "gdb --version", "\\d+\\.\\S+", TRUE }, + { N_("strace"), "strace -V", "\\d+\\.\\d+\\.?\\d*", TRUE }, + { N_("valgrind"), "valgrind --version", "\\d+\\.\\d+\\.\\S+", TRUE }, + { N_("QMake"), "qmake --version", "\\d+\\.\\S+", TRUE}, }; g_free(dev_list); @@ -260,10 +261,10 @@ void scan_dev(gboolean reload) dev_list = h_strdup_cprintf("%s=%s\n", dev_list, detect_lang[i].compiler_name, version); g_free(version); } else { - dev_list = h_strdup_cprintf("%s=Not found\n", dev_list, detect_lang[i].compiler_name); + dev_list = h_strdup_cprintf(_("%s=Not found\n"), dev_list, detect_lang[i].compiler_name); } - temp = g_strdup_printf("Detecting version: %s", + temp = g_strdup_printf(_("Detecting version: %s"), detect_lang[i].compiler_name); shell_status_update(temp); g_free(temp); @@ -274,11 +275,11 @@ void scan_dev(gboolean reload) gchar *callback_dev() { - return g_strdup_printf("[$ShellParam$]\n" + return g_strdup_printf(_("[$ShellParam$]\n" "ColumnTitle$TextValue=Program\n" "ColumnTitle$Value=Version\n" "ShowColumnHeaders=true\n" - "%s", dev_list); + "%s"), dev_list); } #endif /* GLIB_CHECK_VERSION(2,14,0) */ @@ -354,7 +355,7 @@ gchar *computer_get_virtualization() DEBUG("no virtual machine detected; assuming physical machine"); - return g_strdup("Physical machine"); + return g_strdup(_("Physical machine")); } gchar *callback_summary() @@ -371,7 +372,7 @@ gchar *callback_summary() storage_devices = module_call_method("devices::getStorageDevices"); virt = computer_get_virtualization(); - summary = g_strdup_printf("[$ShellParam$]\n" + summary = g_strdup_printf(_("[$ShellParam$]\n" "UpdateInterval$Memory=1000\n" "UpdateInterval$Date/Time=1000\n" "#ReloadInterval=5000\n" @@ -389,7 +390,7 @@ gchar *callback_summary() "\n%s\n" "[Input Devices]\n%s\n" "\n%s\n" - "\n%s\n", + "\n%s\n"), processor_name, virt, computer->os->distro, @@ -413,7 +414,7 @@ gchar *callback_summary() gchar *callback_os() { - return g_strdup_printf("[$ShellParam$]\n" + return g_strdup_printf(_("[$ShellParam$]\n" "UpdateInterval$Uptime=10000\n" "UpdateInterval$Load Average=1000\n" "[Version]\n" @@ -429,7 +430,7 @@ gchar *callback_os() "Desktop Environment=%s\n" "[Misc]\n" "Uptime=...\n" - "Load Average=...", + "Load Average=..."), computer->os->kernel, computer->os->kernel_version, computer->os->libc, @@ -442,39 +443,39 @@ gchar *callback_os() gchar *callback_modules() { - return g_strdup_printf("[Loaded Modules]\n" + return g_strdup_printf(_("[Loaded Modules]\n" "%s" "[$ShellParam$]\n" "ViewType=1\n" "ColumnTitle$TextValue=Name\n" "ColumnTitle$Value=Description\n" - "ShowColumnHeaders=true\n", module_list); + "ShowColumnHeaders=true\n"), module_list); } gchar *callback_boots() { - return g_strdup_printf("[$ShellParam$]\n" + return g_strdup_printf(_("[$ShellParam$]\n" "ColumnTitle$TextValue=Date & Time\n" "ColumnTitle$Value=Kernel Version\n" "ShowColumnHeaders=true\n" "\n" - "%s", computer->os->boots); + "%s"), computer->os->boots); } gchar *callback_locales() { - return g_strdup_printf("[$ShellParam$]\n" + return g_strdup_printf(_("[$ShellParam$]\n" "ViewType=1\n" "ColumnTitle$TextValue=Language Code\n" "ColumnTitle$Value=Name\n" "ShowColumnHeaders=true\n" "[Available Languages]\n" - "%s", computer->os->languages); + "%s"), computer->os->languages); } gchar *callback_fs() { - return g_strdup_printf("[$ShellParam$]\n" + return g_strdup_printf(_("[$ShellParam$]\n" "ViewType=4\n" "ReloadInterval=5000\n" "Zebra=1\n" @@ -483,12 +484,12 @@ gchar *callback_fs() "ColumnTitle$Progress=Usage\n" "ColumnTitle$TextValue=Device\n" "ShowColumnHeaders=true\n" - "[Mounted File Systems]\n%s\n", fs_list); + "[Mounted File Systems]\n%s\n"), fs_list); } gchar *callback_display() { - return g_strdup_printf("[Display]\n" + return g_strdup_printf(_("[Display]\n" "Resolution=%dx%d pixels\n" "Vendor=%s\n" "Version=%s\n" @@ -500,7 +501,7 @@ gchar *callback_display() "Vendor=%s\n" "Renderer=%s\n" "Version=%s\n" - "Direct Rendering=%s\n", + "Direct Rendering=%s\n"), computer->display->width, computer->display->height, computer->display->vendor, @@ -510,7 +511,7 @@ gchar *callback_display() computer->display->ogl_vendor, computer->display->ogl_renderer, computer->display->ogl_version, - computer->display->dri ? "Yes" : "No"); + computer->display->dri ? _("Y_es") : _("No")); } gchar *callback_users() @@ -524,13 +525,13 @@ gchar *callback_users() gchar *callback_groups() { - return g_strdup_printf("[$ShellParam$]\n" + return g_strdup_printf(_("[$ShellParam$]\n" "ReloadInterval=10000\n" "ColumnTitle$TextValue=Name\n" "ColumnTitle$Value=Group ID\n" "ShowColumnHeaders=true\n" "[Groups]\n" - "%s\n", groups); + "%s\n"), groups); } gchar *get_os_kernel(void) @@ -604,7 +605,7 @@ ModuleEntry *hi_module_get_entries(void) gchar *hi_module_get_name(void) { - return g_strdup("Computer"); + return g_strdup(_("Computer")); } guchar hi_module_get_weight(void) @@ -698,7 +699,7 @@ ModuleAbout *hi_module_get_about(void) static ModuleAbout ma[] = { { .author = "Leandro A. F. Pereira", - .description = "Gathers high-level computer information", + .description = N_("Gathers high-level computer information"), .version = VERSION, .license = "GNU GPL version 2"} }; diff --git a/modules/computer/alsa.c b/modules/computer/alsa.c index f1ff3ad8..e1e7b946 100644 --- a/modules/computer/alsa.c +++ b/modules/computer/alsa.c @@ -23,14 +23,14 @@ gchar * computer_get_alsacards(Computer * computer) { GSList *p; - gchar *tmp = g_strdup("[Audio Devices]\n"); + gchar *tmp = g_strdup(_("[Audio Devices]\n")); gint n = 0; if (computer->alsa) { for (p = computer->alsa->cards; p; p = p->next) { AlsaCard *ac = (AlsaCard *) p->data; - tmp = h_strdup_cprintf("Audio Adapter#%d=%s\n", + tmp = h_strdup_cprintf(_("Audio Adapter#%d=%s\n"), tmp, ++n, ac->friendly_name); } } diff --git a/modules/computer/boots.c b/modules/computer/boots.c index 2944ff91..478e89ac 100644 --- a/modules/computer/boots.c +++ b/modules/computer/boots.c @@ -30,7 +30,7 @@ scan_boots_real(void) scan_os(FALSE); if (!computer->os->boots) - computer->os->boots = g_strdup("[Boots]\n"); + computer->os->boots = g_strdup(_("[Boots]\n")); else return; diff --git a/modules/computer/display.c b/modules/computer/display.c index ce23bbfd..d68345c6 100644 --- a/modules/computer/display.c +++ b/modules/computer/display.c @@ -80,9 +80,9 @@ get_x11_info(DisplayInfo *di) if (tmp[1] && tmp[0]) { tmp[1] = g_strchug(tmp[1]); - get_str("vendor string", di->vendor); - get_str("X.Org version", di->version); - get_str("XFree86 version", di->version); + get_str(_("vendor string"), di->vendor); + get_str(_("X.Org version"), di->version); + get_str(_("XFree86 version"), di->version); if (g_str_has_prefix(tmp[0], "number of extensions")) { int n; @@ -119,7 +119,7 @@ get_x11_info(DisplayInfo *di) gdk_screen_get_monitor_geometry(screen, i, &rect); - di->monitors = h_strdup_cprintf("Monitor %d=%dx%d pixels\n", + di->monitors = h_strdup_cprintf(_("Monitor %d=%dx%d pixels\n"), di->monitors, i, rect.width, rect.height); } } else { diff --git a/modules/computer/environment.c b/modules/computer/environment.c index 8ef63b2d..2a8d235c 100644 --- a/modules/computer/environment.c +++ b/modules/computer/environment.c @@ -29,7 +29,7 @@ void scan_env_var(gboolean reload) g_free(_env); - _env = g_strdup("[Environment Variables]\n"); + _env = g_strdup(_("[Environment Variables]\n")); for (i = 0, envlist = g_listenv(); envlist[i]; i++) { _env = h_strdup_cprintf("%s=%s\n", _env, envlist[i], g_getenv(envlist[i])); diff --git a/modules/computer/loadavg.c b/modules/computer/loadavg.c index 523812be..e970fd44 100644 --- a/modules/computer/loadavg.c +++ b/modules/computer/loadavg.c @@ -38,7 +38,6 @@ computer_get_formatted_loadavg() { LoadInfo *li; gchar *tmp; - li = computer_get_loadinfo(); tmp = diff --git a/modules/computer/os.c b/modules/computer/os.c index b5db28ec..b9d8d6f9 100644 --- a/modules/computer/os.c +++ b/modules/computer/os.c @@ -46,11 +46,11 @@ get_libc_version(void) if (p) *p = '\0'; else goto err; - return g_strdup_printf("GNU C Library version %s (%sstable)", + return g_strdup_printf(_("GNU C Library version %s (%sstable)"), strchr(tmp, ' ') + 1, - strstr(buf, " stable ") ? "" : "un"); + strstr(buf, " stable ") ? "" : _("un")); err: - return g_strdup("Unknown"); + return g_strdup(_("Unknown")); } #include <gdk/gdkx.h> @@ -69,7 +69,7 @@ detect_desktop_environment(OperatingSystem * os) obtain the version. */ version = popen("gnome-about --gnome-version", "r"); if (version) { - (void)fscanf(version, "Version: %s", vers); + (void)fscanf(version, _("Version: %s"), vers); if (pclose(version)) goto unknown; } else { @@ -103,7 +103,7 @@ detect_desktop_environment(OperatingSystem * os) os->desktop = NULL; if (!g_getenv("DISPLAY")) { - os->desktop = g_strdup("Terminal"); + os->desktop = g_strdup(_("Terminal")); } else { GdkScreen *screen = gdk_screen_get_default(); @@ -123,11 +123,11 @@ detect_desktop_environment(OperatingSystem * os) } if (!os->desktop) { - os->desktop = g_strdup_printf("Unknown (Window Manager: %s)", + os->desktop = g_strdup_printf(_("Unknown (Window Manager: %s)"), windowman); } } else { - os->desktop = g_strdup("Unknown"); + os->desktop = g_strdup(_("Unknown")); } } } @@ -163,7 +163,7 @@ computer_get_os(void) for (i = 0;; i++) { if (distro_db[i].file == NULL) { os->distrocode = g_strdup("unk"); - os->distro = g_strdup("Unknown distribution"); + os->distro = g_strdup(_("Unknown distribution")); break; } @@ -198,7 +198,7 @@ computer_get_os(void) if (g_str_equal(distro_db[i].codename, "ppy")) { gchar *tmp; - tmp = g_strdup_printf("Puppy Linux %.2f", atof(os->distro) / 100.0); + tmp = g_strdup_printf("Puppy Linux"); g_free(os->distro); os->distro = tmp; } diff --git a/modules/devices.c b/modules/devices.c index 6c6343d5..59163f04 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -71,20 +71,20 @@ void scan_device_resources(gboolean reload); gchar *hi_more_info(gchar *entry); static ModuleEntry entries[] = { - {"Processor", "processor.png", callback_processors, scan_processors, MODULE_FLAG_NONE}, - {"Memory", "memory.png", callback_memory, scan_memory, MODULE_FLAG_NONE}, - {"PCI Devices", "devices.png", callback_pci, scan_pci, MODULE_FLAG_NONE}, - {"USB Devices", "usb.png", callback_usb, scan_usb, MODULE_FLAG_NONE}, - {"Printers", "printer.png", callback_printers, scan_printers, MODULE_FLAG_NONE}, - {"Battery", "battery.png", callback_battery, scan_battery, MODULE_FLAG_NONE}, - {"Sensors", "therm.png", callback_sensors, scan_sensors, MODULE_FLAG_NONE}, - {"Input Devices", "inputdevices.png", callback_input, scan_input, MODULE_FLAG_NONE}, - {"Storage", "hdd.png", callback_storage, scan_storage, MODULE_FLAG_NONE}, + {N_("Processor"), "processor.png", callback_processors, scan_processors, MODULE_FLAG_NONE}, + {N_("Memory"), "memory.png", callback_memory, scan_memory, MODULE_FLAG_NONE}, + {N_("PCI Devices"), "devices.png", callback_pci, scan_pci, MODULE_FLAG_NONE}, + {N_("USB Devices"), "usb.png", callback_usb, scan_usb, MODULE_FLAG_NONE}, + {N_("Printers"), "printer.png", callback_printers, scan_printers, MODULE_FLAG_NONE}, + {N_("Battery"), "battery.png", callback_battery, scan_battery, MODULE_FLAG_NONE}, + {N_("Sensors"), "therm.png", callback_sensors, scan_sensors, MODULE_FLAG_NONE}, + {N_("Input Devices"), "inputdevices.png", callback_input, scan_input, MODULE_FLAG_NONE}, + {N_("Storage"), "hdd.png", callback_storage, scan_storage, MODULE_FLAG_NONE}, #if defined(ARCH_x86) || defined(ARCH_x86_64) - {"DMI", "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE}, - {"Memory SPD", "memory.png", callback_spd, scan_spd, MODULE_FLAG_NONE}, + {N_("DMI"), "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE}, + {N_("Memory SPD"), "memory.png", callback_spd, scan_spd, MODULE_FLAG_NONE}, #endif /* x86 or x86_64 */ - {"Resources", "resources.png", callback_device_resources, scan_device_resources, MODULE_FLAG_NONE}, + {N_("Resources"), "resources.png", callback_device_resources, scan_device_resources, MODULE_FLAG_NONE}, {NULL} }; @@ -151,7 +151,7 @@ gchar *get_processor_frequency(void) p = (Processor *)processors->data; if (p->cpu_mhz == 0.0f) { - return g_strdup("Unknown"); + return g_strdup(N_("Unknown")); } else { return g_strdup_printf("%.0f", p->cpu_mhz); } @@ -175,7 +175,7 @@ gchar *get_pci_device_description(gchar *pci_id) gchar *get_memory_total(void) { scan_memory(FALSE); - return hi_more_info("Total Memory"); + return hi_more_info(N_("Total Memory")); } gchar *get_motherboard(void) @@ -190,11 +190,11 @@ gchar *get_motherboard(void) if (board_name && board_vendor && *board_name && *board_vendor) return g_strconcat(board_vendor, " ", board_name, NULL); else if (board_name && *board_name) - return g_strconcat(board_name, " (vendor unknown)", NULL); + return g_strconcat(board_name, _(" (vendor unknown)"), NULL); else if (board_vendor && *board_vendor) - return g_strconcat(board_vendor, " (model unknown)", NULL); + return g_strconcat(board_vendor, _(" (model unknown)"), NULL); - return g_strdup("Unknown"); + return g_strdup(_("Unknown")); } ShellModuleMethod *hi_exported_methods(void) @@ -409,7 +409,7 @@ ModuleEntry *hi_module_get_entries(void) gchar *hi_module_get_name(void) { - return g_strdup("Devices"); + return g_strdup(_("Devices")); } guchar hi_module_get_weight(void) @@ -421,7 +421,7 @@ void hi_module_init(void) { if (!g_file_test("/usr/share/misc/pci.ids", G_FILE_TEST_EXISTS)) { static SyncEntry se = { - .fancy_name = "Update PCI ID listing", + .fancy_name = N_("Update PCI ID listing"), .name = "GetPCIIds", .save_to = "pci.ids", .get_data = NULL @@ -433,7 +433,7 @@ void hi_module_init(void) #if defined(ARCH_x86) || defined(ARCH_x86_64) { static SyncEntry se = { - .fancy_name = "Update CPU feature database", + .fancy_name = N_("Update CPU feature database"), .name = "RecvCPUFlags", .save_to = "cpuflags.conf", .get_data = NULL @@ -461,7 +461,7 @@ ModuleAbout *hi_module_get_about(void) static ModuleAbout ma[] = { { .author = "Leandro A. F. Pereira", - .description = "Gathers information about hardware devices", + .description = N_("Gathers information about hardware devices"), .version = VERSION, .license = "GNU GPL version 2"} }; diff --git a/modules/devices/battery.c b/modules/devices/battery.c index d6d95255..404786c3 100644 --- a/modules/devices/battery.c +++ b/modules/devices/battery.c @@ -178,13 +178,13 @@ __scan_battery_acpi(void) else charge_rate = 0; - battery_list = h_strdup_cprintf("\n[Battery: %s]\n" + battery_list = h_strdup_cprintf(_("\n[Battery: %s]\n" "State=%s (load: %s)\n" "Capacity=%s / %s (%.2f%%)\n" "Battery Technology=%s (%s)\n" "Manufacturer=%s\n" "Model Number=%s\n" - "Serial Number=%s\n", + "Serial Number=%s\n"), battery_list, entry, state, rate, @@ -263,23 +263,23 @@ __scan_battery_apm(void) } if (stotal && sremaining) { - battery_list = h_strdup_cprintf("\n[Battery (APM)]\n" + battery_list = h_strdup_cprintf(_("\n[Battery (APM)]\n" "Charge=%d%%\n" "Remaining Charge=%s of %s\n" "Using=%s\n" "APM driver version=%s\n" - "APM BIOS version=%s\n", + "APM BIOS version=%s\n"), battery_list, percentage, sremaining, stotal, ac_status[ac_bat], apm_drv_ver, apm_bios_ver); } else { - battery_list = h_strdup_cprintf("\n[Battery (APM)]\n" + battery_list = h_strdup_cprintf(_("\n[Battery (APM)]\n" "Charge=%d%%\n" "Using=%s\n" "APM driver version=%s\n" - "APM BIOS version=%s\n", + "APM BIOS version=%s\n"), battery_list, percentage, ac_status[ac_bat], @@ -301,7 +301,7 @@ scan_battery_do(void) if (*battery_list == '\0') { g_free(battery_list); - battery_list = g_strdup("[No batteries]\n" - "No batteries found on this system=\n"); + battery_list = g_strdup(_("[No batteries]\n" + "No batteries found on this system=\n")); } } diff --git a/modules/devices/printers.c b/modules/devices/printers.c index c3a02c45..77b52a43 100644 --- a/modules/devices/printers.c +++ b/modules/devices/printers.c @@ -78,42 +78,42 @@ gchar *__cups_callback_ptype(gchar *strvalue) gchar *output = g_strdup("\n"); if (value & 0x0004) - output = h_strdup_cprintf("\342\232\254 Can do black and white printing=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Can do black and white printing=\n"), output); if (value & 0x0008) - output = h_strdup_cprintf("\342\232\254 Can do color printing=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Can do color printing=\n"), output); if (value & 0x0010) - output = h_strdup_cprintf("\342\232\254 Can do duplexing=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Can do duplexing=\n"), output); if (value & 0x0020) - output = h_strdup_cprintf("\342\232\254 Can do staple output=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Can do staple output=\n"), output); if (value & 0x0040) - output = h_strdup_cprintf("\342\232\254 Can do copies=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Can do copies=\n"), output); if (value & 0x0080) - output = h_strdup_cprintf("\342\232\254 Can collate copies=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Can collate copies=\n"), output); if (value & 0x80000) - output = h_strdup_cprintf("\342\232\254 Printer is rejecting jobs=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Printer is rejecting jobs=\n"), output); if (value & 0x1000000) - output = h_strdup_cprintf("\342\232\254 Printer was automatically discovered and added=\n", output); + output = h_strdup_cprintf(_("\342\232\254 Printer was automatically discovered and added=\n"), output); return output; } else { - return g_strdup("Unknown"); + return g_strdup(_("Unknown")); } } gchar *__cups_callback_state(gchar *value) { if (!value) { - return g_strdup("Unknown"); + return g_strdup(_("Unknown")); } if (g_str_equal(value, "3")) { - return g_strdup("Idle"); + return g_strdup(_("Idle")); } else if (g_str_equal(value, "4")) { - return g_strdup("Printing a Job"); + return g_strdup(_("Printing a Job")); } else if (g_str_equal(value, "5")) { - return g_strdup("Stopped"); + return g_strdup(_("Stopped")); } else { - return g_strdup("Unknown"); + return g_strdup(_("Unknown")); } } @@ -128,16 +128,16 @@ gchar *__cups_callback_state_change_time(gchar *value) return g_strdup(buf); } else { - return g_strdup("Unknown"); + return g_strdup(_("Unknown")); } } gchar *__cups_callback_boolean(gchar *value) { if (value) { - return g_strdup(g_str_equal(value, "1") ? "Yes" : "No"); + return g_strdup(g_str_equal(value, "1") ? _("Yes") : _("No")); } else { - return g_strdup("Unknown"); + return g_strdup(_("Unknown")); } } @@ -187,8 +187,8 @@ scan_printers_do(void) init_cups(); printer_icons = g_strdup(""); - printer_list = g_strdup("[Printers]\n" - "No suitable CUPS library found="); + printer_list = g_strdup(_("[Printers]\n" + "No suitable CUPS library found=")); return; } @@ -197,7 +197,7 @@ scan_printers_do(void) num_dests = cups_dests_get(&dests); if (num_dests > 0) { - printer_list = g_strdup_printf("[Printers (CUPS)]\n"); + printer_list = g_strdup_printf(_("[Printers (CUPS)]\n")); printer_icons = g_strdup(""); for (i = 0; i < num_dests; i++) { GHashTable *options; @@ -240,7 +240,7 @@ scan_printers_do(void) /* FIXME Do proper escaping */ temp = g_strdup(strreplacechr(temp, "&=", ' ')); } else { - temp = g_strdup("Unknown"); + temp = g_strdup(_("Unknown")); } } @@ -260,7 +260,7 @@ scan_printers_do(void) cups_dests_free(num_dests, dests); } else { - printer_list = g_strdup("[Printers]\n" - "No printers found=\n"); + printer_list = g_strdup(_("[Printers]\n" + "No printers found=\n")); } } diff --git a/modules/devices/storage.c b/modules/devices/storage.c index 3df6c765..127e27c8 100644 --- a/modules/devices/storage.c +++ b/modules/devices/storage.c @@ -43,7 +43,7 @@ __scan_scsi_devices(void) if (!g_file_test("/proc/scsi/scsi", G_FILE_TEST_EXISTS)) return; - scsi_storage_list = g_strdup("\n[SCSI Disks]\n"); + scsi_storage_list = g_strdup(_("\n[SCSI Disks]\n")); if ((proc_scsi = fopen("/proc/scsi/scsi", "r"))) { while (fgets(buffer, 256, proc_scsi)) { @@ -107,27 +107,27 @@ __scan_scsi_devices(void) scsi_storage_list = h_strdup_cprintf("$%s$%s=\n", scsi_storage_list, devid, model); storage_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", storage_icons, devid, model, icon); - gchar *strhash = g_strdup_printf("[Device Information]\n" - "Model=%s\n", model); + gchar *strhash = g_strdup_printf(_("[Device Information]\n" + "Model=%s\n"), model); const gchar *url = vendor_get_url(model); if (url) { - strhash = h_strdup_cprintf("Vendor=%s (%s)\n", + strhash = h_strdup_cprintf(_("Vendor=%s (%s)\n"), strhash, vendor_get_name(model), url); } else { - strhash = h_strdup_cprintf("Vendor=%s\n", + strhash = h_strdup_cprintf(_("Vendor=%s\n"), strhash, vendor_get_name(model)); } - strhash = h_strdup_cprintf("Type=%s\n" + strhash = h_strdup_cprintf(_("Type=%s\n" "Revision=%s\n" "[SCSI Controller]\n" "Controller=scsi%d\n" "Channel=%d\n" - "ID=%d\n" "LUN=%d\n", + "ID=%d\n" "LUN=%d\n"), strhash, type, revision, @@ -166,7 +166,7 @@ __scan_ide_devices(void) /* remove old devices from global device table */ moreinfo_del_with_prefix("DEV:IDE"); - ide_storage_list = g_strdup("\n[IDE Disks]\n"); + ide_storage_list = g_strdup(_("\n[IDE Disks]\n")); iface = 'a'; for (i = 0; i <= 16; i++) { @@ -239,7 +239,7 @@ __scan_ide_devices(void) strreplacechr(g_strstrip(buf), ":", '='), "\n", NULL); } else if (strstr(buf, "Device seems to be")) { - driver = g_strdup_printf("Driver=%s\n", strchr(buf, ':') + 1); + driver = g_strdup_printf(_("Driver=%s\n"), strchr(buf, ':') + 1); } } @@ -294,26 +294,26 @@ __scan_ide_devices(void) model, g_str_equal(media, "cdrom") ? \ "cdrom" : "hdd"); - gchar *strhash = g_strdup_printf("[Device Information]\n" - "Model=%s\n", + gchar *strhash = g_strdup_printf(_("[Device Information]\n" + "Model=%s\n"), model); const gchar *url = vendor_get_url(model); if (url) { - strhash = h_strdup_cprintf("Vendor=%s (%s)\n", + strhash = h_strdup_cprintf(_("Vendor=%s (%s)\n"), strhash, vendor_get_name(model), url); } else { - strhash = h_strdup_cprintf("Vendor=%s\n", + strhash = h_strdup_cprintf(_("Vendor=%s\n"), strhash, vendor_get_name(model)); } - strhash = h_strdup_cprintf("Device Name=hd%c\n" + strhash = h_strdup_cprintf(_("Device Name=hd%c\n" "Media=%s\n" - "Cache=%dkb\n", + "Cache=%dkb\n"), strhash, iface, media, @@ -326,9 +326,9 @@ __scan_ide_devices(void) } if (pgeometry && lgeometry) { - strhash = h_strdup_cprintf("[Geometry]\n" + strhash = h_strdup_cprintf(_("[Geometry]\n" "Physical=%s\n" - "Logical=%s\n", + "Logical=%s\n"), strhash, pgeometry, lgeometry); g_free(pgeometry); @@ -338,14 +338,14 @@ __scan_ide_devices(void) } if (capab) { - strhash = h_strdup_cprintf("[Capabilities]\n%s", strhash, capab); + strhash = h_strdup_cprintf(_("[Capabilities]\n%s"), strhash, capab); g_free(capab); capab = NULL; } if (speed) { - strhash = h_strdup_cprintf("[Speeds]\n%s", strhash, speed); + strhash = h_strdup_cprintf(_("[Speeds]\n%s"), strhash, speed); g_free(speed); speed = NULL; diff --git a/modules/network.c b/modules/network.c index 95cec5ec..18f8ba65 100644 --- a/modules/network.c +++ b/modules/network.c @@ -56,13 +56,13 @@ void scan_arp(gboolean reload); void scan_statistics(gboolean reload); static ModuleEntry entries[] = { - {"Interfaces", "network-interface.png", callback_network, scan_network, MODULE_FLAG_NONE}, - {"IP Connections", "network-connections.png", callback_connections, scan_connections, MODULE_FLAG_NONE}, - {"Routing Table", "network.png", callback_route, scan_route, MODULE_FLAG_NONE}, - {"ARP Table", "module.png", callback_arp, scan_arp, MODULE_FLAG_NONE}, - {"DNS Servers", "dns.png", callback_dns, scan_dns, MODULE_FLAG_NONE}, - {"Statistics", "network-statistics.png", callback_statistics, scan_statistics, MODULE_FLAG_NONE}, - {"Shared Directories", "shares.png", callback_shares, scan_shares, MODULE_FLAG_NONE}, + {N_("Interfaces"), "network-interface.png", callback_network, scan_network, MODULE_FLAG_NONE}, + {N_("IP Connections"), "network-connections.png", callback_connections, scan_connections, MODULE_FLAG_NONE}, + {N_("Routing Table"), "network.png", callback_route, scan_route, MODULE_FLAG_NONE}, + {N_("ARP Table"), "module.png", callback_arp, scan_arp, MODULE_FLAG_NONE}, + {N_("DNS Servers"), "dns.png", callback_dns, scan_dns, MODULE_FLAG_NONE}, + {N_("Statistics"), "network-statistics.png", callback_statistics, scan_statistics, MODULE_FLAG_NONE}, + {N_("Shared Directories"), "shares.png", callback_shares, scan_shares, MODULE_FLAG_NONE}, {NULL}, }; @@ -297,14 +297,14 @@ void scan_connections(gboolean reload) gchar *callback_arp() { - return g_strdup_printf("[ARP Table]\n" + return g_strdup_printf(_("[ARP Table]\n" "%s\n" "[$ShellParam$]\n" "ReloadInterval=3000\n" "ColumnTitle$TextValue=IP Address\n" "ColumnTitle$Value=Interface\n" "ColumnTitle$Extra1=MAC Address\n" - "ShowColumnHeaders=true\n", + "ShowColumnHeaders=true\n"), __arp_table); } @@ -318,17 +318,17 @@ gchar *callback_shares() gchar *callback_dns() { - return g_strdup_printf("[Name servers]\n" + return g_strdup_printf(_("[Name servers]\n" "%s\n" "[$ShellParam$]\n" "ColumnTitle$TextValue=IP Address\n" "ColumnTitle$Value=Name\n" - "ShowColumnHeaders=true\n", __nameservers); + "ShowColumnHeaders=true\n"), __nameservers); } gchar *callback_connections() { - return g_strdup_printf("[Connections]\n" + return g_strdup_printf(_("[Connections]\n" "%s\n" "[$ShellParam$]\n" "ReloadInterval=3000\n" @@ -336,13 +336,13 @@ gchar *callback_connections() "ColumnTitle$Value=Protocol\n" "ColumnTitle$Extra1=Foreign Address\n" "ColumnTitle$Extra2=State\n" - "ShowColumnHeaders=true\n", + "ShowColumnHeaders=true\n"), __connections); } gchar *callback_network() { - return g_strdup_printf("%s\n" + return g_strdup_printf(_("%s\n" "[$ShellParam$]\n" "ReloadInterval=3000\n" "ViewType=1\n" @@ -351,14 +351,14 @@ gchar *callback_network() "ColumnTitle$Extra1=Sent\n" "ColumnTitle$Extra2=Received\n" "ShowColumnHeaders=true\n" - "%s", + "%s"), network_interfaces, network_icons); } gchar *callback_route() { - return g_strdup_printf("[IP routing table]\n" + return g_strdup_printf(_("[IP routing table]\n" "%s\n" "[$ShellParam$]\n" "ViewType=0\n" @@ -367,7 +367,7 @@ gchar *callback_route() "ColumnTitle$Value=Interface\n" "ColumnTitle$Extra1=Flags\n" "ColumnTitle$Extra2=Mask\n" - "ShowColumnHeaders=true\n", + "ShowColumnHeaders=true\n"), __routing_table); } @@ -396,7 +396,7 @@ ModuleEntry *hi_module_get_entries(void) gchar *hi_module_get_name(void) { - return g_strdup("Network"); + return g_strdup(_("Network")); } guchar hi_module_get_weight(void) @@ -429,7 +429,7 @@ ModuleAbout *hi_module_get_about(void) static ModuleAbout ma[] = { { .author = "Leandro A. F. Pereira", - .description = "Gathers information about this computer's network connection", + .description = N_("Gathers information about this computer's network connection"), .version = VERSION, .license = "GNU GPL version 2"} }; |