Realize that we are using cmake, and modify the build system using elementary module

9 files changed, 709 insertions, 855 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1ea09f4..cfdb658a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(HardInfo)
 cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.6)
 
 set(HARDINFO_VERSION "0.5.2pre")
 
@@ -48,6 +49,8 @@ message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_AR
 
 add_definitions("-std=gnu89")
 
+add_subdirectory(po)
+
 include(FindPkgConfig)
 pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.10 glib-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10)
 pkg_check_modules(LIBSOUP libsoup-2.4>=2.24)
diff --git a/cmake/Translations.cmake b/cmake/Translations.cmake
new file mode 100644
index 00000000..476fb374
--- /dev/null
+++ b/cmake/Translations.cmake
@@ -0,0 +1,41 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+
+    set(C_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
+        )
+endmacro()
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 00000000..95dbdfea
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,3 @@
+include(Translations)
+add_translations_directory("hardinfo")
+add_translations_catalog("hardinfo" ../shell/ ../modules/ ../hardinfo/ ../remote/ ../help-viewer/ )
\ No newline at end of file
diff --git a/po/HOWTO.txt b/po/HOWTO.txt
index 3d4593ea..6773d6ea 100644
--- a/po/HOWTO.txt
+++ b/po/HOWTO.txt
@@ -1,2 +1,2 @@
-update .pot : in po/, make hardinfo.pot
+update .pot : make pot in build/
 update .po files after .pot update : ?
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index adc719b4..00000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1 +0,0 @@
-ru
\ No newline at end of file
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index cc8a2227..00000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
-	fi
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index 591e6387..00000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,19 +0,0 @@
-shell/callbacks.c
-shell/menu.c
-shell/report.c
-shell/shell.c
-shell/syncmanager.c
-modules/benchmark.c
-modules/computer.c
-modules/devices.c
-modules/network.c
-modules/computer/alsa.c
-modules/computer/boots.c
-modules/computer/display.c
-modules/computer/environment.c
-hardinfo/util.c
-modules/devices/x86/processor.c
-modules/devices/printers.c
-modules/computer/os.c
-modules/devices/battery.c
-modules/devices/storage.c
diff --git a/po/hardinfo.pot b/po/hardinfo.pot
index 9ffabb54..dd3f4077 100644
--- a/po/hardinfo.pot
+++ b/po/hardinfo.pot
@@ -8,380 +8,390 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 22:24+0300\n"
+"POT-Creation-Date: 2013-01-05 17:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: shell/callbacks.c:71
-#, c-format
-msgid "Remote: <b>%s</b>"
+#: shell//report.c:492
+msgid "Save File"
 msgstr ""
 
-#: shell/callbacks.c:117
-msgid "Disconnecting..."
+#: shell//report.c:616
+msgid "Cannot create ReportContext. Programming bug?"
 msgstr ""
 
-#: shell/callbacks.c:120
-msgid "Unloading modules..."
+#: shell//report.c:634
+msgid "Open the report with your web browser?"
 msgstr ""
 
-#: shell/callbacks.c:123
-msgid "Loading local modules..."
+#: shell//report.c:662
+msgid "Generating report..."
 msgstr ""
 
-#: shell/callbacks.c:130 shell/callbacks.c:162 shell/shell.c:314
-#: shell/shell.c:814 shell/shell.c:1796 modules/benchmark.c:431
-#: modules/benchmark.c:439 hardinfo/util.c:1106
-msgid "Done."
+#: shell//report.c:672
+msgid "Report saved."
 msgstr ""
 
-#: shell/callbacks.c:142
-msgid "Save Image"
+#: shell//report.c:674
+msgid "Error while creating the report."
 msgstr ""
 
-#: shell/callbacks.c:158
-msgid "Saving image..."
+#: shell//report.c:776
+msgid "Generate Report"
 msgstr ""
 
-#: shell/callbacks.c:236
-msgid "No context help available."
+#: shell//report.c:793
+msgid ""
+"<big><b>Generate Report</b></big>\n"
+"Please choose the information that you wish to view in your report:"
 msgstr ""
 
-#: shell/callbacks.c:318
-#, c-format
-msgid "%s Module"
+#: shell//report.c:853
+msgid "Select _None"
 msgstr ""
 
-#: shell/callbacks.c:325
-#, c-format
-msgid ""
-"Written by %s\n"
-"Licensed under %s"
+#: shell//report.c:860
+msgid "Select _All"
 msgstr ""
 
-#: shell/callbacks.c:339
-#, c-format
-msgid "No about information is associated with the %s module."
+#: shell//report.c:878
+msgid "_Generate"
 msgstr ""
 
-#: shell/callbacks.c:353
-msgid "Author:"
+#: shell//menu.c:35
+msgid "_Information"
 msgstr ""
 
-#: shell/callbacks.c:356
-msgid "Contributors:"
+#: shell//menu.c:36
+msgid "_Remote"
 msgstr ""
 
-#: shell/callbacks.c:360
-msgid "Based on work by:"
+#: shell//menu.c:37
+msgid "_View"
 msgstr ""
 
-#: shell/callbacks.c:361
-msgid "MD5 implementation by Colin Plumb (see md5.c for details)"
+#: shell//menu.c:38
+msgid "_Help"
 msgstr ""
 
-#: shell/callbacks.c:362
-msgid "SHA1 implementation by Steve Reid (see sha1.c for details)"
+#: shell//menu.c:39
+msgid "About _Modules"
 msgstr ""
 
-#: shell/callbacks.c:363
-msgid "Blowfish implementation by Paul Kocher (see blowfich.c for details)"
+#: shell//menu.c:43
+msgid "Generate _Report"
 msgstr ""
 
-#: shell/callbacks.c:364
-msgid "Raytracing benchmark by John Walker (see fbench.c for details)"
+#: shell//menu.c:48
+msgid "_Network Updater..."
 msgstr ""
 
-#: shell/callbacks.c:365
-msgid "FFT benchmark by Scott Robert Ladd (see fftbench.c for details)"
+#: shell//menu.c:53
+msgid "_Open..."
 msgstr ""
 
-#: shell/callbacks.c:366
-msgid "Some code partly based on x86cpucaps by Osamu Kayasono"
+#: shell//menu.c:58
+msgid "_Connect to..."
 msgstr ""
 
-#: shell/callbacks.c:367
-msgid "Vendor list based on GtkSysInfo by Pissens Sebastien"
+#: shell//menu.c:63
+msgid "_Manage hosts..."
 msgstr ""
 
-#: shell/callbacks.c:368
-msgid "DMI support based on code by Stewart Adam"
+#: shell//menu.c:68
+msgid "_Local computer"
 msgstr ""
 
-#: shell/callbacks.c:369
-msgid "SCSI support based on code by Pascal F. Martin"
+#: shell//menu.c:73
+msgid "_Copy to Clipboard"
 msgstr ""
 
-#: shell/callbacks.c:373
-msgid "Jakub Szypulka"
+#: shell//menu.c:74
+msgid "Copy to clipboard"
 msgstr ""
 
-#: shell/callbacks.c:374
-msgid "Tango Project"
+#: shell//menu.c:78
+msgid "_Save image as..."
 msgstr ""
 
-#: shell/callbacks.c:375
-msgid "The GNOME Project"
+#: shell//menu.c:83
+msgid "_Refresh"
 msgstr ""
 
-#: shell/callbacks.c:376
-msgid "VMWare, Inc. (USB icon from VMWare Workstation 6)"
+#: shell//menu.c:88
+msgid "Contents"
 msgstr ""
 
-#: shell/callbacks.c:387
-msgid "System information and benchmark tool"
+#: shell//menu.c:93
+#: shell//shell.c:1790
+#: shell//shell.c:1807
+msgid "Context help"
 msgstr ""
 
-#: shell/callbacks.c:392
-msgid ""
-"HardInfo is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation, version 2.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin St, Fifth Floor, Boston, MA  02110-1301 USA"
+#: shell//menu.c:98
+msgid "_Open HardInfo Web Site"
 msgstr ""
 
-#: shell/menu.c:35
-msgid "_Information"
+#: shell//menu.c:103
+msgid "_Report bug"
 msgstr ""
 
-#: shell/menu.c:36
-msgid "_Remote"
+#: shell//menu.c:108
+msgid "_Donate to the project"
 msgstr ""
 
-#: shell/menu.c:37
-msgid "_View"
+#: shell//menu.c:113
+msgid "_About HardInfo"
 msgstr ""
 
-#: shell/menu.c:38
-msgid "_Help"
+#: shell//menu.c:114
+msgid "Displays program version information"
 msgstr ""
 
-#: shell/menu.c:39
-msgid "About _Modules"
+#: shell//menu.c:118
+msgid "_Quit"
 msgstr ""
 
-#: shell/menu.c:43
-msgid "Generate _Report"
+#: shell//menu.c:125
+msgid "_Side Pane"
 msgstr ""
 
-#: shell/menu.c:48
-msgid "_Network Updater..."
+#: shell//menu.c:126
+msgid "Toggles side pane visibility"
 msgstr ""
 
-#: shell/menu.c:53
-msgid "_Open..."
+#: shell//menu.c:129
+msgid "_Toolbar"
 msgstr ""
 
-#: shell/menu.c:58
-msgid "_Connect to..."
+#: shell//menu.c:133
+msgid "_Accept connections"
 msgstr ""
 
-#: shell/menu.c:63
-msgid "_Manage hosts..."
+#: shell//callbacks.c:71
+#, c-format
+msgid "Remote: <b>%s</b>"
 msgstr ""
 
-#: shell/menu.c:68
-msgid "_Local computer"
+#: shell//callbacks.c:117
+msgid "Disconnecting..."
 msgstr ""
 
-#: shell/menu.c:73
-msgid "_Copy to Clipboard"
+#: shell//callbacks.c:120
+msgid "Unloading modules..."
 msgstr ""
 
-#: shell/menu.c:74
-msgid "Copy to clipboard"
+#: shell//callbacks.c:123
+msgid "Loading local modules..."
 msgstr ""
 
-#: shell/menu.c:78
-msgid "_Save image as..."
+#: shell//callbacks.c:130
+#: shell//callbacks.c:162
+#: shell//shell.c:314
+#: shell//shell.c:814
+#: shell//shell.c:1796
+#: modules//benchmark.c:431
+#: modules//benchmark.c:439
+#: hardinfo//util.c:1106
+msgid "Done."
 msgstr ""
 
-#: shell/menu.c:83
-msgid "_Refresh"
+#: shell//callbacks.c:142
+msgid "Save Image"
 msgstr ""
 
-#: shell/menu.c:88
-msgid "Contents"
+#: shell//callbacks.c:158
+msgid "Saving image..."
 msgstr ""
 
-#: shell/menu.c:93 shell/shell.c:1790 shell/shell.c:1807
-msgid "Context help"
+#: shell//callbacks.c:236
+msgid "No context help available."
 msgstr ""
 
-#: shell/menu.c:98
-msgid "_Open HardInfo Web Site"
+#: shell//callbacks.c:318
+#, c-format
+msgid "%s Module"
 msgstr ""
 
-#: shell/menu.c:103
-msgid "_Report bug"
+#: shell//callbacks.c:325
+#, c-format
+msgid ""
+"Written by %s\n"
+"Licensed under %s"
 msgstr ""
 
-#: shell/menu.c:108
-msgid "_Donate to the project"
+#: shell//callbacks.c:339
+#, c-format
+msgid "No about information is associated with the %s module."
 msgstr ""
 
-#: shell/menu.c:113
-msgid "_About HardInfo"
+#: shell//callbacks.c:353
+msgid "Author:"
 msgstr ""
 
-#: shell/menu.c:114
-msgid "Displays program version information"
+#: shell//callbacks.c:356
+msgid "Contributors:"
 msgstr ""
 
-#: shell/menu.c:118
-msgid "_Quit"
+#: shell//callbacks.c:360
+msgid "Based on work by:"
 msgstr ""
 
-#: shell/menu.c:125
-msgid "_Side Pane"
+#: shell//callbacks.c:361
+msgid "MD5 implementation by Colin Plumb (see md5.c for details)"
 msgstr ""
 
-#: shell/menu.c:126
-msgid "Toggles side pane visibility"
+#: shell//callbacks.c:362
+msgid "SHA1 implementation by Steve Reid (see sha1.c for details)"
 msgstr ""
 
-#: shell/menu.c:129
-msgid "_Toolbar"
+#: shell//callbacks.c:363
+msgid "Blowfish implementation by Paul Kocher (see blowfich.c for details)"
 msgstr ""
 
-#: shell/menu.c:133
-msgid "_Accept connections"
+#: shell//callbacks.c:364
+msgid "Raytracing benchmark by John Walker (see fbench.c for details)"
 msgstr ""
 
-#: shell/report.c:492
-msgid "Save File"
+#: shell//callbacks.c:365
+msgid "FFT benchmark by Scott Robert Ladd (see fftbench.c for details)"
 msgstr ""
 
-#: shell/report.c:616
-msgid "Cannot create ReportContext. Programming bug?"
+#: shell//callbacks.c:366
+msgid "Some code partly based on x86cpucaps by Osamu Kayasono"
 msgstr ""
 
-#: shell/report.c:634
-msgid "Open the report with your web browser?"
+#: shell//callbacks.c:367
+msgid "Vendor list based on GtkSysInfo by Pissens Sebastien"
 msgstr ""
 
-#: shell/report.c:662
-msgid "Generating report..."
+#: shell//callbacks.c:368
+msgid "DMI support based on code by Stewart Adam"
 msgstr ""
 
-#: shell/report.c:672
-msgid "Report saved."
+#: shell//callbacks.c:369
+msgid "SCSI support based on code by Pascal F. Martin"
 msgstr ""
 
-#: shell/report.c:674
-msgid "Error while creating the report."
+#: shell//callbacks.c:373
+msgid "Jakub Szypulka"
 msgstr ""
 
-#: shell/report.c:776
-msgid "Generate Report"
+#: shell//callbacks.c:374
+msgid "Tango Project"
 msgstr ""
 
-#: shell/report.c:793
-msgid ""
-"<big><b>Generate Report</b></big>\n"
-"Please choose the information that you wish to view in your report:"
+#: shell//callbacks.c:375
+msgid "The GNOME Project"
 msgstr ""
 
-#: shell/report.c:853
-msgid "Select _None"
+#: shell//callbacks.c:376
+msgid "VMWare, Inc. (USB icon from VMWare Workstation 6)"
 msgstr ""
 
-#: shell/report.c:860
-msgid "Select _All"
+#: shell//callbacks.c:387
+msgid "System information and benchmark tool"
 msgstr ""
 
-#: shell/report.c:878
-msgid "_Generate"
+#: shell//callbacks.c:392
+msgid ""
+"HardInfo is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, version 2.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA  02110-1301 USA"
 msgstr ""
 
-#: shell/shell.c:407
+#: shell//shell.c:407
 #, c-format
 msgid "%s - System Information"
 msgstr ""
 
-#: shell/shell.c:412
+#: shell//shell.c:412
 msgid "System Information"
 msgstr ""
 
-#: shell/shell.c:801
+#: shell//shell.c:801
 msgid "Loading modules..."
 msgstr ""
 
-#: shell/shell.c:1650
+#: shell//shell.c:1650
 #, c-format
 msgid "<b>%s → Summary</b>"
 msgstr ""
 
-#: shell/shell.c:1758
+#: shell//shell.c:1758
 msgid "Updating..."
 msgstr ""
 
-#: shell/syncmanager.c:69
+#: shell//syncmanager.c:69
 msgid ""
 "<big><b>Synchronize with Central Database</b></big>\n"
 "The following information may be synchronized with the HardInfo central "
 "database."
 msgstr ""
 
-#: shell/syncmanager.c:72
+#: shell//syncmanager.c:72
 msgid ""
 "<big><b>Synchronizing</b></big>\n"
 "This may take some time."
 msgstr ""
 
-#: shell/syncmanager.c:132
+#: shell//syncmanager.c:132
 msgid ""
 "HardInfo was compiled without libsoup support. (Network Updater requires it.)"
 msgstr ""
 
-#: shell/syncmanager.c:161 shell/syncmanager.c:185
+#: shell//syncmanager.c:161
+#: shell//syncmanager.c:185
 #, c-format
 msgid "%s (error #%d)"
 msgstr ""
 
-#: shell/syncmanager.c:170 shell/syncmanager.c:194
+#: shell//syncmanager.c:170
+#: shell//syncmanager.c:194
 msgid "Could not parse XML-RPC response"
 msgstr ""
 
-#: shell/syncmanager.c:267
+#: shell//syncmanager.c:267
 #, c-format
 msgid ""
 "Server says it supports API version %d, but this version of HardInfo only "
 "supports API version %d."
 msgstr ""
 
-#: shell/syncmanager.c:362
+#: shell//syncmanager.c:362
 msgid "Contacting HardInfo Central Database"
 msgstr ""
 
-#: shell/syncmanager.c:363
+#: shell//syncmanager.c:363
 msgid "Cleaning up"
 msgstr ""
 
-#: shell/syncmanager.c:480
+#: shell//syncmanager.c:480
 #, c-format
 msgid "<s>%s</s> <i>(canceled)</i>"
 msgstr ""
 
-#: shell/syncmanager.c:497
+#: shell//syncmanager.c:497
 #, c-format
 msgid "<b><s>%s</s></b> <i>(failed)</i>"
 msgstr ""
 
-#: shell/syncmanager.c:509
+#: shell//syncmanager.c:509
 #, c-format
 msgid ""
 "Failed while performing \"%s\". Please file a bug report if this problem "
@@ -390,241 +400,141 @@ msgid ""
 "Details: %s"
 msgstr ""
 
-#: shell/syncmanager.c:518
+#: shell//syncmanager.c:518
 #, c-format
 msgid ""
 "Failed while performing \"%s\". Please file a bug report if this problem "
 "persists. (Use the Help→Report bug option.)"
 msgstr ""
 
-#: shell/syncmanager.c:646
+#: shell//syncmanager.c:646
 msgid "Network Updater"
 msgstr ""
 
-#: shell/syncmanager.c:727
+#: shell//syncmanager.c:727
 msgid "_Synchronize"
 msgstr ""
 
-#: modules/benchmark.c:50
-msgid "CPU Blowfish"
-msgstr ""
-
-#: modules/benchmark.c:51
-msgid "CPU CryptoHash"
-msgstr ""
-
-#: modules/benchmark.c:52
-msgid "CPU Fibonacci"
-msgstr ""
-
-#: modules/benchmark.c:53
-msgid "CPU N-Queens"
-msgstr ""
-
-#: modules/benchmark.c:54
-msgid "FPU FFT"
-msgstr ""
-
-#: modules/benchmark.c:55
-msgid "FPU Raytracing"
-msgstr ""
-
-#: modules/benchmark.c:56
-msgid "GPU Drawing"
-msgstr ""
-
-#: modules/benchmark.c:222
-#, c-format
-msgid ""
-"[$ShellParam$]\n"
-"Zebra=1\n"
-"OrderType=%d\n"
-"ViewType=3\n"
-"ColumnTitle$Extra1=CPU Clock\n"
-"ColumnTitle$Progress=Results\n"
-"ColumnTitle$TextValue=CPU\n"
-"ShowColumnHeaders=true\n"
-"[%s]\n"
-"<big><b>This Machine</b></big>=%.3f|%s MHz\n"
-"%s"
-msgstr ""
-
-#: modules/benchmark.c:235
-#, c-format
-msgid ""
-"[$ShellParam$]\n"
-"Zebra=1\n"
-"OrderType=%d\n"
-"ViewType=3\n"
-"ColumnTitle$Extra1=CPU Clock\n"
-"ColumnTitle$Progress=Results\n"
-"ColumnTitle$TextValue=CPU\n"
-"ShowColumnHeaders=true\n"
-"[%s]\n"
-"%s"
-msgstr ""
-
-#: modules/benchmark.c:363
-#, c-format
-msgid "Benchmarking: <b>%s</b>."
-msgstr ""
-
-#: modules/benchmark.c:377
-msgid "Benchmarking. Please do not move your mouse or press any keys."
-msgstr ""
-
-#: modules/benchmark.c:381
-msgid "Cancel"
-msgstr ""
-
-#: modules/benchmark.c:511
-msgid "Results in MiB/second. Higher is better."
-msgstr ""
-
-#: modules/benchmark.c:514
-msgid "Results in HIMarks. Higher is better."
-msgstr ""
-
-#: modules/benchmark.c:521
-msgid "Results in seconds. Lower is better."
-msgstr ""
-
-#: modules/benchmark.c:529
-msgid "Benchmarks"
-msgstr ""
-
-#: modules/benchmark.c:547
-msgid "Perform tasks and compare with other systems"
-msgstr ""
-
-#: modules/benchmark.c:634
-msgid "Send benchmark results"
-msgstr ""
-
-#: modules/benchmark.c:639
-msgid "Receive benchmark results"
-msgstr ""
-
-#: modules/computer.c:68
+#: modules//computer.c:68
 msgid "Summary"
 msgstr ""
 
-#: modules/computer.c:69
+#: modules//computer.c:69
 msgid "Operating System"
 msgstr ""
 
-#: modules/computer.c:70
+#: modules//computer.c:70
 msgid "Kernel Modules"
 msgstr ""
 
-#: modules/computer.c:71
+#: modules//computer.c:71
 msgid "Boots"
 msgstr ""
 
-#: modules/computer.c:72
+#: modules//computer.c:72
 msgid "Languages"
 msgstr ""
 
-#: modules/computer.c:73
+#: modules//computer.c:73
 msgid "Filesystems"
 msgstr ""
 
-#: modules/computer.c:74
+#: modules//computer.c:74
 msgid "Display"
 msgstr ""
 
-#: modules/computer.c:75
+#: modules//computer.c:75
 msgid "Environment Variables"
 msgstr ""
 
-#: modules/computer.c:77
+#: modules//computer.c:77
 msgid "Development"
 msgstr ""
 
-#: modules/computer.c:79
+#: modules//computer.c:79
 msgid "Users"
 msgstr ""
 
-#: modules/computer.c:80
+#: modules//computer.c:80
 msgid "Groups"
 msgstr ""
 
-#: modules/computer.c:104
+#: modules//computer.c:104
 #, c-format
 msgid "%dMB (%dMB used)"
 msgstr ""
 
-#: modules/computer.c:200
+#: modules//computer.c:200
 msgid "Scripting Languages"
 msgstr ""
 
-#: modules/computer.c:201
+#: modules//computer.c:201
 msgid "CPython"
 msgstr ""
 
-#: modules/computer.c:202
+#: modules//computer.c:202
 msgid "Perl"
 msgstr ""
 
-#: modules/computer.c:203
+#: modules//computer.c:203
 msgid "PHP"
 msgstr ""
 
-#: modules/computer.c:204
+#: modules//computer.c:204
 msgid "Ruby"
 msgstr ""
 
-#: modules/computer.c:205
+#: modules//computer.c:205
 msgid "Bash"
 msgstr ""
 
-#: modules/computer.c:206
+#: modules//computer.c:206
 msgid "Compilers"
 msgstr ""
 
-#: modules/computer.c:207
+#: modules//computer.c:207
 msgid "C (GCC)"
 msgstr ""
 
-#: modules/computer.c:208
+#: modules//computer.c:208
 msgid "Java"
 msgstr ""
 
-#: modules/computer.c:209
+#: modules//computer.c:209
 msgid "CSharp (Mono, old)"
 msgstr ""
 
-#: modules/computer.c:210
+#: modules//computer.c:210
 msgid "CSharp (Mono)"
 msgstr ""
 
-#: modules/computer.c:211
+#: modules//computer.c:211
 msgid "Vala"
 msgstr ""
 
-#: modules/computer.c:212
+#: modules//computer.c:212
 msgid "Haskell (GHC)"
 msgstr ""
 
-#: modules/computer.c:213
+#: modules//computer.c:213
 msgid "FreePascal"
 msgstr ""
 
-#: modules/computer.c:214
+#: modules//computer.c:214
 msgid "Tools"
 msgstr ""
 
-#: modules/computer.c:262
+#: modules//computer.c:262
 #, c-format
 msgid "%s=Not found\n"
 msgstr ""
 
-#: modules/computer.c:265
+#: modules//computer.c:265
 #, c-format
 msgid "Detecting version: %s"
 msgstr ""
 
-#: modules/computer.c:276
+#: modules//computer.c:276
 #, c-format
 msgid ""
 "[$ShellParam$]\n"
@@ -634,11 +544,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: modules/computer.c:356
+#: modules//computer.c:356
 msgid "Physical machine"
 msgstr ""
 
-#: modules/computer.c:373
+#: modules//computer.c:373
 #, c-format
 msgid ""
 "[$ShellParam$]\n"
@@ -666,7 +576,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: modules/computer.c:415
+#: modules//computer.c:415
 #, c-format
 msgid ""
 "[$ShellParam$]\n"
@@ -688,7 +598,7 @@ msgid ""
 "Load Average=..."
 msgstr ""
 
-#: modules/computer.c:444
+#: modules//computer.c:444
 #, c-format
 msgid ""
 "[Loaded Modules]\n"
@@ -699,7 +609,7 @@ msgid ""
 "ShowColumnHeaders=true\n"
 msgstr ""
 
-#: modules/computer.c:455
+#: modules//computer.c:455
 #, c-format
 msgid ""
 "[$ShellParam$]\n"
@@ -710,7 +620,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: modules/computer.c:465
+#: modules//computer.c:465
 #, c-format
 msgid ""
 "[$ShellParam$]\n"
@@ -722,7 +632,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: modules/computer.c:476
+#: modules//computer.c:476
 #, c-format
 msgid ""
 "[$ShellParam$]\n"
@@ -738,7 +648,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: modules/computer.c:490
+#: modules//computer.c:490
 #, c-format
 msgid ""
 "[Display]\n"
@@ -754,15 +664,17 @@ msgid ""
 "Direct Rendering=%s\n"
 msgstr ""
 
-#: modules/computer.c:512
+#: modules//computer.c:512
 msgid "Y_es"
 msgstr ""
 
-#: modules/computer.c:512 modules/devices/printers.c:138
+#: modules//computer.c:512
+#: modules//devices/printers.c:138
+#: hardinfo//hardinfo.c:63
 msgid "No"
 msgstr ""
 
-#: modules/computer.c:526
+#: modules//computer.c:526
 #, c-format
 msgid ""
 "[$ShellParam$]\n"
@@ -774,127 +686,380 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: modules/computer.c:606
+#: modules//computer.c:606
 msgid "Computer"
 msgstr ""
 
-#: modules/computer.c:700
+#: modules//computer.c:700
 msgid "Gathers high-level computer information"
 msgstr ""
 
-#: modules/devices.c:74
+#: modules//devices.c:74
 msgid "Processor"
 msgstr ""
 
-#: modules/devices.c:75
+#: modules//devices.c:75
 msgid "Memory"
 msgstr ""
 
-#: modules/devices.c:76
+#: modules//devices.c:76
 msgid "PCI Devices"
 msgstr ""
 
-#: modules/devices.c:77
+#: modules//devices.c:77
 msgid "USB Devices"
 msgstr ""
 
-#: modules/devices.c:78
+#: modules//devices.c:78
 msgid "Printers"
 msgstr ""
 
-#: modules/devices.c:79
+#: modules//devices.c:79
 msgid "Battery"
 msgstr ""
 
-#: modules/devices.c:80
+#: modules//devices.c:80
 msgid "Sensors"
 msgstr ""
 
-#: modules/devices.c:81
+#: modules//devices.c:81
 msgid "Input Devices"
 msgstr ""
 
-#: modules/devices.c:82
+#: modules//devices.c:82
 msgid "Storage"
 msgstr ""
 
-#: modules/devices.c:84
+#: modules//devices.c:84
 msgid "DMI"
 msgstr ""
 
-#: modules/devices.c:85
+#: modules//devices.c:85
 msgid "Memory SPD"
 msgstr ""
 
-#: modules/devices.c:87
+#: modules//devices.c:87
 msgid "Resources"
 msgstr ""
 
-#: modules/devices.c:154 modules/devices.c:197 modules/devices/printers.c:99
-#: modules/devices/printers.c:106 modules/devices/printers.c:116
-#: modules/devices/printers.c:131 modules/devices/printers.c:140
-#: modules/devices/printers.c:243 modules/computer/os.c:53
-#: modules/computer/os.c:130
+#: modules//devices.c:154
+#: modules//devices.c:197
+#: modules//computer/os.c:53
+#: modules//computer/os.c:130
+#: modules//devices/printers.c:99
+#: modules//devices/printers.c:106
+#: modules//devices/printers.c:116
+#: modules//devices/printers.c:131
+#: modules//devices/printers.c:140
+#: modules//devices/printers.c:243
 msgid "Unknown"
 msgstr ""
 
-#: modules/devices.c:178
+#: modules//devices.c:178
 msgid "Total Memory"
 msgstr ""
 
-#: modules/devices.c:193
+#: modules//devices.c:193
 msgid " (vendor unknown)"
 msgstr ""
 
-#: modules/devices.c:195
+#: modules//devices.c:195
 msgid " (model unknown)"
 msgstr ""
 
-#: modules/devices.c:412
+#: modules//devices.c:412
 msgid "Devices"
 msgstr ""
 
-#: modules/devices.c:424
+#: modules//devices.c:424
 msgid "Update PCI ID listing"
 msgstr ""
 
-#: modules/devices.c:436
+#: modules//devices.c:436
 msgid "Update CPU feature database"
 msgstr ""
 
-#: modules/devices.c:464
+#: modules//devices.c:464
 msgid "Gathers information about hardware devices"
 msgstr ""
 
-#: modules/network.c:59
+#: modules//computer/boots.c:33
+msgid "[Boots]\n"
+msgstr ""
+
+#: modules//computer/environment.c:32
+msgid "[Environment Variables]\n"
+msgstr ""
+
+#: modules//computer/display.c:83
+msgid "vendor string"
+msgstr ""
+
+#: modules//computer/display.c:84
+msgid "X.Org version"
+msgstr ""
+
+#: modules//computer/display.c:85
+msgid "XFree86 version"
+msgstr ""
+
+#: modules//computer/display.c:122
+#, c-format
+msgid "Monitor %d=%dx%d pixels\n"
+msgstr ""
+
+#: modules//computer/alsa.c:26
+msgid "[Audio Devices]\n"
+msgstr ""
+
+#: modules//computer/alsa.c:33
+#, c-format
+msgid "Audio Adapter#%d=%s\n"
+msgstr ""
+
+#: modules//computer/os.c:49
+#, c-format
+msgid "GNU C Library version %s (%sstable)"
+msgstr ""
+
+#: modules//computer/os.c:51
+msgid "un"
+msgstr ""
+
+#: modules//computer/os.c:72
+#, c-format
+msgid "Version: %s"
+msgstr ""
+
+#: modules//computer/os.c:106
+msgid "Terminal"
+msgstr ""
+
+#: modules//computer/os.c:126
+#, c-format
+msgid "Unknown (Window Manager: %s)"
+msgstr ""
+
+#: modules//computer/os.c:166
+msgid "Unknown distribution"
+msgstr ""
+
+#: modules//devices/battery.c:181
+#, c-format
+msgid ""
+"\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"
+msgstr ""
+
+#: modules//devices/battery.c:266
+#, c-format
+msgid ""
+"\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"
+msgstr ""
+
+#: modules//devices/battery.c:278
+#, c-format
+msgid ""
+"\n"
+"[Battery (APM)]\n"
+"Charge=%d%%\n"
+"Using=%s\n"
+"APM driver version=%s\n"
+"APM BIOS version=%s\n"
+msgstr ""
+
+#: modules//devices/battery.c:304
+msgid ""
+"[No batteries]\n"
+"No batteries found on this system=\n"
+msgstr ""
+
+#: modules//devices/printers.c:81
+msgid "⚬ Can do black and white printing=\n"
+msgstr ""
+
+#: modules//devices/printers.c:83
+msgid "⚬ Can do color printing=\n"
+msgstr ""
+
+#: modules//devices/printers.c:85
+msgid "⚬ Can do duplexing=\n"
+msgstr ""
+
+#: modules//devices/printers.c:87
+msgid "⚬ Can do staple output=\n"
+msgstr ""
+
+#: modules//devices/printers.c:89
+msgid "⚬ Can do copies=\n"
+msgstr ""
+
+#: modules//devices/printers.c:91
+msgid "⚬ Can collate copies=\n"
+msgstr ""
+
+#: modules//devices/printers.c:93
+msgid "⚬ Printer is rejecting jobs=\n"
+msgstr ""
+
+#: modules//devices/printers.c:95
+msgid "⚬ Printer was automatically discovered and added=\n"
+msgstr ""
+
+#: modules//devices/printers.c:110
+msgid "Idle"
+msgstr ""
+
+#: modules//devices/printers.c:112
+msgid "Printing a Job"
+msgstr ""
+
+#: modules//devices/printers.c:114
+msgid "Stopped"
+msgstr ""
+
+#: modules//devices/printers.c:138
+#: hardinfo//hardinfo.c:62
+#: hardinfo//hardinfo.c:63
+msgid "Yes"
+msgstr ""
+
+#: modules//devices/printers.c:190
+msgid ""
+"[Printers]\n"
+"No suitable CUPS library found="
+msgstr ""
+
+#: modules//devices/printers.c:200
+msgid "[Printers (CUPS)]\n"
+msgstr ""
+
+#: modules//devices/printers.c:263
+msgid ""
+"[Printers]\n"
+"No printers found=\n"
+msgstr ""
+
+#: modules//devices/storage.c:46
+msgid ""
+"\n"
+"[SCSI Disks]\n"
+msgstr ""
+
+#: modules//devices/storage.c:110
+#: modules//devices/storage.c:297
+#, c-format
+msgid ""
+"[Device Information]\n"
+"Model=%s\n"
+msgstr ""
+
+#: modules//devices/storage.c:115
+#: modules//devices/storage.c:304
+#, c-format
+msgid "Vendor=%s (%s)\n"
+msgstr ""
+
+#: modules//devices/storage.c:120
+#: modules//devices/storage.c:309
+#, c-format
+msgid "Vendor=%s\n"
+msgstr ""
+
+#: modules//devices/storage.c:125
+#, c-format
+msgid ""
+"Type=%s\n"
+"Revision=%s\n"
+"[SCSI Controller]\n"
+"Controller=scsi%d\n"
+"Channel=%d\n"
+"ID=%d\n"
+"LUN=%d\n"
+msgstr ""
+
+#: modules//devices/storage.c:169
+msgid ""
+"\n"
+"[IDE Disks]\n"
+msgstr ""
+
+#: modules//devices/storage.c:242
+#, c-format
+msgid "Driver=%s\n"
+msgstr ""
+
+#: modules//devices/storage.c:314
+#, c-format
+msgid ""
+"Device Name=hd%c\n"
+"Media=%s\n"
+"Cache=%dkb\n"
+msgstr ""
+
+#: modules//devices/storage.c:329
+#, c-format
+msgid ""
+"[Geometry]\n"
+"Physical=%s\n"
+"Logical=%s\n"
+msgstr ""
+
+#: modules//devices/storage.c:341
+#, c-format
+msgid ""
+"[Capabilities]\n"
+"%s"
+msgstr ""
+
+#: modules//devices/storage.c:348
+#, c-format
+msgid ""
+"[Speeds]\n"
+"%s"
+msgstr ""
+
+#: modules//network.c:59
 msgid "Interfaces"
 msgstr ""
 
-#: modules/network.c:60
+#: modules//network.c:60
 msgid "IP Connections"
 msgstr ""
 
-#: modules/network.c:61
+#: modules//network.c:61
 msgid "Routing Table"
 msgstr ""
 
-#: modules/network.c:62
+#: modules//network.c:62
 msgid "ARP Table"
 msgstr ""
 
-#: modules/network.c:63
+#: modules//network.c:63
 msgid "DNS Servers"
 msgstr ""
 
-#: modules/network.c:64
+#: modules//network.c:64
 msgid "Statistics"
 msgstr ""
 
-#: modules/network.c:65
+#: modules//network.c:65
 msgid "Shared Directories"
 msgstr ""
 
-#: modules/network.c:300
+#: modules//network.c:300
 #, c-format
 msgid ""
 "[ARP Table]\n"
@@ -907,7 +1072,7 @@ msgid ""
 "ShowColumnHeaders=true\n"
 msgstr ""
 
-#: modules/network.c:321
+#: modules//network.c:321
 #, c-format
 msgid ""
 "[Name servers]\n"
@@ -918,7 +1083,7 @@ msgid ""
 "ShowColumnHeaders=true\n"
 msgstr ""
 
-#: modules/network.c:331
+#: modules//network.c:331
 #, c-format
 msgid ""
 "[Connections]\n"
@@ -932,7 +1097,7 @@ msgid ""
 "ShowColumnHeaders=true\n"
 msgstr ""
 
-#: modules/network.c:345
+#: modules//network.c:345
 #, c-format
 msgid ""
 "%s\n"
@@ -947,7 +1112,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: modules/network.c:361
+#: modules//network.c:361
 #, c-format
 msgid ""
 "[IP routing table]\n"
@@ -962,420 +1127,301 @@ msgid ""
 "ShowColumnHeaders=true\n"
 msgstr ""
 
-#: modules/network.c:399
+#: modules//network.c:399
 msgid "Network"
 msgstr ""
 
-#: modules/network.c:432
+#: modules//network.c:432
 msgid "Gathers information about this computer's network connection"
 msgstr ""
 
-#: modules/computer/alsa.c:26
-msgid "[Audio Devices]\n"
+#: modules//benchmark.c:50
+msgid "CPU Blowfish"
 msgstr ""
 
-#: modules/computer/alsa.c:33
-#, c-format
-msgid "Audio Adapter#%d=%s\n"
+#: modules//benchmark.c:51
+msgid "CPU CryptoHash"
 msgstr ""
 
-#: modules/computer/boots.c:33
-msgid "[Boots]\n"
+#: modules//benchmark.c:52
+msgid "CPU Fibonacci"
 msgstr ""
 
-#: modules/computer/display.c:83
-msgid "vendor string"
+#: modules//benchmark.c:53
+msgid "CPU N-Queens"
 msgstr ""
 
-#: modules/computer/display.c:84
-msgid "X.Org version"
+#: modules//benchmark.c:54
+msgid "FPU FFT"
 msgstr ""
 
-#: modules/computer/display.c:85
-msgid "XFree86 version"
+#: modules//benchmark.c:55
+msgid "FPU Raytracing"
 msgstr ""
 
-#: modules/computer/display.c:122
+#: modules//benchmark.c:56
+msgid "GPU Drawing"
+msgstr ""
+
+#: modules//benchmark.c:222
 #, c-format
-msgid "Monitor %d=%dx%d pixels\n"
+msgid ""
+"[$ShellParam$]\n"
+"Zebra=1\n"
+"OrderType=%d\n"
+"ViewType=3\n"
+"ColumnTitle$Extra1=CPU Clock\n"
+"ColumnTitle$Progress=Results\n"
+"ColumnTitle$TextValue=CPU\n"
+"ShowColumnHeaders=true\n"
+"[%s]\n"
+"<big><b>This Machine</b></big>=%.3f|%s MHz\n"
+"%s"
 msgstr ""
 
-#: modules/computer/environment.c:32
-msgid "[Environment Variables]\n"
+#: modules//benchmark.c:235
+#, c-format
+msgid ""
+"[$ShellParam$]\n"
+"Zebra=1\n"
+"OrderType=%d\n"
+"ViewType=3\n"
+"ColumnTitle$Extra1=CPU Clock\n"
+"ColumnTitle$Progress=Results\n"
+"ColumnTitle$TextValue=CPU\n"
+"ShowColumnHeaders=true\n"
+"[%s]\n"
+"%s"
+msgstr ""
+
+#: modules//benchmark.c:363
+#, c-format
+msgid "Benchmarking: <b>%s</b>."
+msgstr ""
+
+#: modules//benchmark.c:377
+msgid "Benchmarking. Please do not move your mouse or press any keys."
+msgstr ""
+
+#: modules//benchmark.c:381
+msgid "Cancel"
+msgstr ""
+
+#: modules//benchmark.c:511
+msgid "Results in MiB/second. Higher is better."
+msgstr ""
+
+#: modules//benchmark.c:514
+msgid "Results in HIMarks. Higher is better."
+msgstr ""
+
+#: modules//benchmark.c:521
+msgid "Results in seconds. Lower is better."
+msgstr ""
+
+#: modules//benchmark.c:529
+msgid "Benchmarks"
+msgstr ""
+
+#: modules//benchmark.c:547
+msgid "Perform tasks and compare with other systems"
+msgstr ""
+
+#: modules//benchmark.c:634
+msgid "Send benchmark results"
+msgstr ""
+
+#: modules//benchmark.c:639
+msgid "Receive benchmark results"
 msgstr ""
 
-#: hardinfo/util.c:102 hardinfo/util.c:105 hardinfo/util.c:110
+#: hardinfo//util.c:102
+#: hardinfo//util.c:105
+#: hardinfo//util.c:110
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hardinfo/util.c:104
+#: hardinfo//util.c:104
 #, c-format
 msgid "%d hour, "
 msgid_plural "%d hours, "
 msgstr[0] ""
 msgstr[1] ""
 
-#: hardinfo/util.c:108
+#: hardinfo//util.c:108
 #, c-format
 msgid "%d day, "
 msgid_plural "%d days, "
 msgstr[0] ""
 msgstr[1] ""
 
-#: hardinfo/util.c:109
+#: hardinfo//util.c:109
 #, c-format
 msgid "%d hour and "
 msgid_plural "%d hours and "
 msgstr[0] ""
 msgstr[1] ""
 
-#: hardinfo/util.c:116
+#: hardinfo//util.c:116
 #, c-format
 msgid "%.1f B"
 msgstr ""
 
-#: hardinfo/util.c:118
+#: hardinfo//util.c:118
 #, c-format
 msgid "%.1f KiB"
 msgstr ""
 
-#: hardinfo/util.c:120
+#: hardinfo//util.c:120
 #, c-format
 msgid "%.1f MiB"
 msgstr ""
 
-#: hardinfo/util.c:122
+#: hardinfo//util.c:122
 #, c-format
 msgid "%.1f GiB"
 msgstr ""
 
-#: hardinfo/util.c:336
+#: hardinfo//util.c:336
 msgid "Error"
 msgstr ""
 
-#: hardinfo/util.c:336 hardinfo/util.c:352
+#: hardinfo//util.c:336
+#: hardinfo//util.c:352
 msgid "Warning"
 msgstr ""
 
-#: hardinfo/util.c:351
+#: hardinfo//util.c:351
 msgid "Fatal Error"
 msgstr ""
 
-#: hardinfo/util.c:376
+#: hardinfo//util.c:376
 msgid "creates a report and prints to standard output"
 msgstr ""
 
-#: hardinfo/util.c:382
+#: hardinfo//util.c:382
 msgid "chooses a report format (text, html)"
 msgstr ""
 
-#: hardinfo/util.c:388
+#: hardinfo//util.c:388
 msgid "run benchmark; requires benchmark.so to be loaded"
 msgstr ""
 
-#: hardinfo/util.c:394
+#: hardinfo//util.c:394
 msgid "lists modules"
 msgstr ""
 
-#: hardinfo/util.c:400
+#: hardinfo//util.c:400
 msgid "specify module to load"
 msgstr ""
 
-#: hardinfo/util.c:406
+#: hardinfo//util.c:406
 msgid "automatically load module dependencies"
 msgstr ""
 
-#: hardinfo/util.c:413
+#: hardinfo//util.c:413
 msgid "run in XML-RPC server mode"
 msgstr ""
 
-#: hardinfo/util.c:420
+#: hardinfo//util.c:420
 msgid "shows program version and quit"
 msgstr ""
 
-#: hardinfo/util.c:425
+#: hardinfo//util.c:425
 msgid "- System Profiler and Benchmark tool"
 msgstr ""
 
-#: hardinfo/util.c:435
+#: hardinfo//util.c:435
 #, c-format
 msgid ""
 "Unrecognized arguments.\n"
 "Try ``%s --help'' for more information.\n"
 msgstr ""
 
-#: hardinfo/util.c:501
+#: hardinfo//util.c:501
 #, c-format
 msgid "Couldn't find a Web browser to open URL %s."
 msgstr ""
 
-#: hardinfo/util.c:848
+#: hardinfo//util.c:848
 #, c-format
 msgid "Module \"%s\" depends on module \"%s\", load it?"
 msgstr ""
 
-#: hardinfo/util.c:871
+#: hardinfo//util.c:871
 #, c-format
 msgid "Module \"%s\" depends on module \"%s\"."
 msgstr ""
 
-#: hardinfo/util.c:916
+#: hardinfo//util.c:916
 #, c-format
 msgid "No module could be loaded. Check permissions on \"%s\" and try again."
 msgstr ""
 
-#: hardinfo/util.c:920
+#: hardinfo//util.c:920
 msgid ""
 "No module could be loaded. Please use hardinfo -l to list all available "
 "modules and try again with a valid module list."
 msgstr ""
 
-#: hardinfo/util.c:1096
+#: hardinfo//util.c:1096
 #, c-format
 msgid "Scanning: %s..."
 msgstr ""
 
-#: modules/devices/x86/processor.c:145
-msgid "Cache information not available=\n"
-msgstr ""
-
-#: modules/devices/x86/processor.c:484
-#, c-format
-msgid ""
-"[Processor]\n"
-"Name=%s\n"
-"Family, model, stepping=%d, %d, %d (%s)\n"
-"Vendor=%s\n"
-"[Configuration]\n"
-"Cache Size=%dkb\n"
-"Frequency=%.2fMHz\n"
-"BogoMIPS=%.2f\n"
-"Byte Order=%s\n"
-"[Features]\n"
-"FDIV Bug=%s\n"
-"HLT Bug=%s\n"
-"F00F Bug=%s\n"
-"Coma Bug=%s\n"
-"Has FPU=%s\n"
-"[Cache]\n"
-"%s\n"
-"[Capabilities]\n"
-"%s"
-msgstr ""
-
-#: modules/devices/x86/processor.c:542
-#, c-format
-msgid "%s$CPU%d$%s=%.2fMHz\n"
-msgstr ""
-
-#: modules/devices/printers.c:81
-msgid "⚬ Can do black and white printing=\n"
-msgstr ""
-
-#: modules/devices/printers.c:83
-msgid "⚬ Can do color printing=\n"
-msgstr ""
-
-#: modules/devices/printers.c:85
-msgid "⚬ Can do duplexing=\n"
-msgstr ""
-
-#: modules/devices/printers.c:87
-msgid "⚬ Can do staple output=\n"
-msgstr ""
-
-#: modules/devices/printers.c:89
-msgid "⚬ Can do copies=\n"
-msgstr ""
-
-#: modules/devices/printers.c:91
-msgid "⚬ Can collate copies=\n"
-msgstr ""
-
-#: modules/devices/printers.c:93
-msgid "⚬ Printer is rejecting jobs=\n"
-msgstr ""
-
-#: modules/devices/printers.c:95
-msgid "⚬ Printer was automatically discovered and added=\n"
-msgstr ""
-
-#: modules/devices/printers.c:110
-msgid "Idle"
-msgstr ""
-
-#: modules/devices/printers.c:112
-msgid "Printing a Job"
-msgstr ""
-
-#: modules/devices/printers.c:114
-msgid "Stopped"
-msgstr ""
-
-#: modules/devices/printers.c:138
-msgid "Yes"
-msgstr ""
-
-#: modules/devices/printers.c:190
-msgid ""
-"[Printers]\n"
-"No suitable CUPS library found="
-msgstr ""
-
-#: modules/devices/printers.c:200
-msgid "[Printers (CUPS)]\n"
-msgstr ""
-
-#: modules/devices/printers.c:263
-msgid ""
-"[Printers]\n"
-"No printers found=\n"
-msgstr ""
-
-#: modules/computer/os.c:49
-#, c-format
-msgid "GNU C Library version %s (%sstable)"
-msgstr ""
-
-#: modules/computer/os.c:51
-msgid "un"
-msgstr ""
-
-#: modules/computer/os.c:72
-#, c-format
-msgid "Version: %s"
-msgstr ""
-
-#: modules/computer/os.c:106
-msgid "Terminal"
-msgstr ""
-
-#: modules/computer/os.c:126
-#, c-format
-msgid "Unknown (Window Manager: %s)"
-msgstr ""
-
-#: modules/computer/os.c:166
-msgid "Unknown distribution"
-msgstr ""
-
-#: modules/devices/battery.c:181
-#, c-format
+#: hardinfo//hardinfo.c:54
 msgid ""
+"Copyright (C) 2003-2009 Leandro A. F. Pereira. See COPYING for details.\n"
 "\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"
 msgstr ""
 
-#: modules/devices/battery.c:266
+#: hardinfo//hardinfo.c:56
 #, c-format
 msgid ""
-"\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"
+"Compile-time options:\n"
+"  Release version:   %s (%s)\n"
+"  BinReloc enabled:  %s\n"
+"  Data prefix:       %s\n"
+"  Library prefix:    %s\n"
+"  Compiled on:       %s %s (%s)\n"
 msgstr ""
 
-#: modules/devices/battery.c:278
+#: hardinfo//hardinfo.c:74
 #, c-format
 msgid ""
+"Failed to find runtime data.\n"
 "\n"
-"[Battery (APM)]\n"
-"Charge=%d%%\n"
-"Using=%s\n"
-"APM driver version=%s\n"
-"APM BIOS version=%s\n"
+"• Is HardInfo correctly installed?\n"
+"• See if %s and %s exists and you have read permision."
 msgstr ""
 
-#: modules/devices/battery.c:304
-msgid ""
-"[No batteries]\n"
-"No batteries found on this system=\n"
-msgstr ""
-
-#: modules/devices/storage.c:46
-msgid ""
-"\n"
-"[SCSI Disks]\n"
-msgstr ""
-
-#: modules/devices/storage.c:110 modules/devices/storage.c:297
+#: hardinfo//hardinfo.c:81
 #, c-format
 msgid ""
-"[Device Information]\n"
-"Model=%s\n"
+"Modules:\n"
+"%-20s%-15s%-12s\n"
 msgstr ""
 
-#: modules/devices/storage.c:115 modules/devices/storage.c:304
-#, c-format
-msgid "Vendor=%s (%s)\n"
-msgstr ""
-
-#: modules/devices/storage.c:120 modules/devices/storage.c:309
-#, c-format
-msgid "Vendor=%s\n"
-msgstr ""
-
-#: modules/devices/storage.c:125
-#, c-format
-msgid ""
-"Type=%s\n"
-"Revision=%s\n"
-"[SCSI Controller]\n"
-"Controller=scsi%d\n"
-"Channel=%d\n"
-"ID=%d\n"
-"LUN=%d\n"
-msgstr ""
-
-#: modules/devices/storage.c:169
-msgid ""
-"\n"
-"[IDE Disks]\n"
+#: hardinfo//hardinfo.c:82
+msgid "File Name"
 msgstr ""
 
-#: modules/devices/storage.c:242
-#, c-format
-msgid "Driver=%s\n"
+#: hardinfo//hardinfo.c:82
+msgid "Name"
 msgstr ""
 
-#: modules/devices/storage.c:314
-#, c-format
-msgid ""
-"Device Name=hd%c\n"
-"Media=%s\n"
-"Cache=%dkb\n"
+#: hardinfo//hardinfo.c:82
+msgid "Version"
 msgstr ""
 
-#: modules/devices/storage.c:329
+#: hardinfo//hardinfo.c:135
 #, c-format
-msgid ""
-"[Geometry]\n"
-"Physical=%s\n"
-"Logical=%s\n"
+msgid "Unknown benchmark ``%s'' or libbenchmark.so not loaded"
 msgstr ""
 
-#: modules/devices/storage.c:341
-#, c-format
-msgid ""
-"[Capabilities]\n"
-"%s"
-msgstr ""
-
-#: modules/devices/storage.c:348
-#, c-format
-msgid ""
-"[Speeds]\n"
-"%s"
+#: hardinfo//hardinfo.c:163
+msgid "Don't know what to do. Exiting."
 msgstr ""
diff --git a/po/missing b/po/missing
deleted file mode 100644
index 306ced32..00000000
--- a/po/missing
+++ /dev/null
@@ -1,2 +0,0 @@
-hardinfo/hardinfo.c
-modules/devices/storage.c