diff --git a/Makefile.am b/Makefile.am
index cf782074a..27512f658 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4/
 
-SUBDIRS = src pixmaps
+SUBDIRS = src pixmaps po
 
 EXTRA_DIST = @PACKAGE@.spec
 
diff --git a/configure.ac b/configure.ac
index ffa35fc81..a872cece3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,10 @@ PKG_CHECK_MODULES(PYGTK2, pygtk-2.0 >= 1.99.11)
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0)
 
 AC_OUTPUT(Makefile
+          pixmaps/Makefile
+          po/Makefile
           src/Makefile
           src/virtManager/Makefile
           src/vncViewer/Makefile
           src/graphWidgets/Makefile
-          pixmaps/Makefile
           virt-manager.spec)
diff --git a/po/Makefile.am b/po/Makefile.am
new file mode 100644
index 000000000..92778378f
--- /dev/null
+++ b/po/Makefile.am
@@ -0,0 +1,83 @@
+
+MSGMERGE = msgmerge -v
+POS = $(wildcard $(srcdir)/*.po)
+FMTCATALOGS = $(patsubst $(srcdir)/%.po,%.mo,$(POS))
+NLSDIR = $(datadir)/locale
+
+POTFILE = $(srcdir)/$(PACKAGE).pot
+
+GLADEFILE = $(top_srcdir)/src/$(PACKAGE).glade
+
+GLADESCRATCHFILE = tmp/$(PACKAGE).glade.h
+
+POTFILES = $(top_srcdir)/src/*.py.in \
+           $(top_srcdir)/src/virtManager/*.py \
+           $(top_srcdir)/src/vncViewer/*.py
+
+all: $(FMTCATALOGS)
+
+EXTRA_DIST = $(POTFILE) $(POS)
+
+$(POTFILE): $(POTFILES) $(GLADESCRATCHFILE)
+	xgettext --default-domain=$(PACKAGE) \
+		 --keyword=_ --keyword=N_ $(POTFILES) $(GLADESCRATCHFILE)
+	if cmp -s $(PACKAGE).po $(POTFILE); then \
+	    rm -f $(PACKAGE).po; \
+	else \
+	    mv $(PACKAGE).po $(POTFILE); \
+	fi
+
+$(GLADESCRATCHFILE): $(GLADEFILE)
+	rm -rf tmp/
+	intltool-extract --type=gettext/glade -l $<
+
+update-po: Makefile $(POTFILE) refresh-po
+
+refresh-po: Makefile
+	for cat in $(POS); do \
+		pot=`echo $$cat | sed -e 's/\.po$$/\.pot$$/'`; \
+		if $(MSGMERGE) $$cat $(POTFILE) > $$pot ; then \
+			mv -f $$pot $$cat ; \
+			echo "$(MSGMERGE) of $$cat succeeded" ; \
+		else \
+			echo "$(MSGMERGE) of $$cat failed" ; \
+			rm -f $$pot ; \
+		fi \
+	done
+
+report:
+	@for cat in $(POS); do \
+		echo -n "$$cat: "; \
+		msgfmt -v --statistics -o /dev/null $$cat; \
+	done
+
+CLEANFILES = $(FMTCATALOGS) $(GLADESCRATCHFILE) tmp
+
+install-data-local:	$(FMTCARALOGS) 
+	mkdir -p $(DESTDIR)$(NLSDIR)
+	for n in $(FMTCATALOGS); do \
+	    l=`basename $$n .mo`; \
+	    $(INSTALL) -m 755 -d $(DESTDIR)$(NLSDIR)/$$l; \
+	    $(INSTALL) -m 755 -d $(DESTDIR)$(NLSDIR)/$$l/LC_MESSAGES; \
+	    $(INSTALL) -m 644 $$n \
+		$(DESTDIR)$(NLSDIR)/$$l/LC_MESSAGES/$(PACKAGE).mo; \
+	done
+
+.PHONY: missing
+
+missing:
+	mkdir -p missing; \
+	for n in $(FMTCATALOGS); do \
+	    msghack -w 999999 --missing $$n > missing/$$n-; \
+            msghack -w 999999 --empty missing/$$n- | grep -v "^#," > missing/$$n; \
+	    rm missing/$$n-; \
+	done
+
+missing-mixed:
+	mkdir -p missing-mixed; \
+	for n in $(FMTCATALOGS); do \
+	    msghack -w 999999 --missing $$n > missing-mixed/$$n; \
+	done
+
+%.mo: %.po
+	msgfmt --check -o $@ $<
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 000000000..b6425a3d4
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,640 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: virt-manager 0.1.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-08 10:26-0400\n"
+"PO-Revision-Date: 2006-08-08 10:02+EDT\n"
+"Last-Translator: Daniel Berrange <berrange@redhat.com>\n"
+"Language-Team: Daniel Berrange <berrange@redhat.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../src/virt-manager.py.in:106
+msgid "Could not connection to session bus, disabling DBus service"
+msgstr ""
+
+#: ../../src/virtManager/config.py:177 ../../src/virtManager/config.py:191
+#: ../../src/virtManager/config.py:205
+msgid "Unable to access keyring"
+msgstr ""
+
+#: ../../src/virtManager/console.py:143
+msgid "Unable to activate console"
+msgstr ""
+
+#: ../../src/virtManager/console.py:189 ../../src/virtManager/details.py:167
+msgid "Shutdown requested, but machine is already shutting down / shutoff"
+msgstr ""
+
+#: ../../src/virtManager/console.py:197 ../../src/virtManager/details.py:175
+msgid "Pause/resume requested, but machine is shutdown / shutoff"
+msgstr ""
+
+#: ../../src/virtManager/console.py:203 ../../src/virtManager/details.py:181
+msgid "Pause requested, but machine is already paused"
+msgstr ""
+
+#: ../../src/virtManager/console.py:208 ../../src/virtManager/details.py:186
+msgid "Resume requested, but machine is already running"
+msgstr ""
+
+#: ../../src/virtManager/console.py:274
+msgid "paused"
+msgstr ""
+
+#: ../../src/virtManager/console.py:288
+msgid "Couldn't open console: "
+msgstr ""
+
+#: ../../src/virtManager/domain.py:251
+msgid "Running"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:253
+msgid "Paused"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:255 tmp/virt-manager.glade.h:98
+msgid "Shutdown"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:257
+msgid "Shutoff"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:259
+msgid "Crashed"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:261
+msgid "Unknown status code"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:63
+#, python-format
+msgid "Unable to open connection to hypervisor URI '%s'"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:103
+#, python-format
+msgid "Error refreshing connection '%s'"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:212
+msgid "Save requested, but machine is shutdown / shutoff / paused"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:214
+msgid "Save Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:227
+msgid "Saving Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:150
+msgid "Restore Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:164
+msgid "Restoring Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:182
+#, python-format
+msgid "Error restoring domain '%s'. Is the domain already running?"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:278
+msgid "ID"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:279
+msgid "Name"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:280 tmp/virt-manager.glade.h:100
+msgid "Status"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:281 tmp/virt-manager.glade.h:39
+msgid "CPU usage"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:282
+msgid "VCPUs"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:283 tmp/virt-manager.glade.h:66
+msgid "Memory usage"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:284 tmp/virt-manager.glade.h:48
+msgid "Disk usage"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:285 tmp/virt-manager.glade.h:72
+msgid "Network traffic"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:1
+msgid " free"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:2
+msgid " of "
+msgstr ""
+
+#: tmp/virt-manager.glade.h:3
+msgid "/tmp"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:4
+msgid "00:16:3e:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:5
+msgid "10 TB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:7
+#, no-c-format
+msgid "18%"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:8
+msgid "2 GB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:9
+msgid "20 bits/sec"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:10
+msgid "200 MB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:11
+msgid "256\t"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:12
+msgid "30 MB of 128 MB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:13
+msgid "80 MB of 1 GB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:14
+msgid ":"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:15
+msgid "<b>Basic details</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:16
+msgid "<b>CPUs</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:17
+msgid "<b>Memory</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:18
+msgid "<b>Network</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:19
+msgid "<b>Performance</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:20
+msgid "<b>Physical</b> host CPU count: "
+msgstr ""
+
+#: tmp/virt-manager.glade.h:21
+msgid "<b>Status monitoring</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:22
+msgid "<b>Storage</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:23
+msgid "<b>The console is currently unavailable</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:24
+msgid ""
+"<b>Tip:</b> Acceptable values for hex digits are the numbers 0-9 and the "
+"letters A-F"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:25
+msgid ""
+"<b>Tip:</b> File location paths are as seen from the physical host. Mount "
+"points are as seen from the virtual machine."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:26
+msgid ""
+"<b>Tip:</b> For best performance, the number of virtual CPUs should be less "
+"than the number of physical CPUs on the host system."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:27
+msgid ""
+"<b>Tip:</b> You may only increase the size of file-based storage; you can't "
+"decrease its size."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:28
+msgid ""
+"<b>Too Many Virtual CPUs</b>\n"
+"\n"
+"You have set this virtual machine to have more CPUs than the host system has "
+"physically. This may result in poor performance in the virtual machine."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:31
+msgid "Add Virtual NIC"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:32
+msgid "Add hardware"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:33
+msgid "Add virtual NIC with:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:34
+msgid "Alert"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:35
+msgid ""
+"All virtual machines\n"
+"Active virtual machines\n"
+"Inactive virtual machines"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:38
+msgid "Auth"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:40
+msgid "CPU usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:41
+msgid "CPUs"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:42
+msgid "Connect"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:43
+msgid "Copyright (C) 2006 Red Hat Inc."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:44
+msgid "Current usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:45
+msgid "Delete machine"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:46
+msgid "Details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:47
+msgid "Disk"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:49
+msgid "Disk usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:50
+msgid "Domain ID"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:51
+msgid "Hardware"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:52
+msgid "Host:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:53
+msgid "How many <b>virtual</b> CPUs should this sytem have?"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:54
+msgid "Keep CPU Settings"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:55
+msgid "Launch _Terminal"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:56
+msgid "Local Xen host"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:57
+msgid "Login"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:58
+msgid ""
+"MB\n"
+"GB\n"
+"TB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:61
+msgid "Machine console"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:62
+msgid "Machine details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:63
+msgid "Machine details..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:64
+msgid "Maintain history of"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:65
+msgid "Memory"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:67
+msgid "Memory usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:68
+msgid "Modify CPU Settings"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:69
+msgid "Modify File Storage"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:70
+msgid "Name:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:71
+msgid "Network"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:73
+msgid "Network usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:74
+msgid "New hardware configuration not available"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:75
+msgid "New machine..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:76
+msgid "Open connection"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:77
+msgid "Open connection..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:78
+msgid "Open terminal"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:79
+msgid "Other hypervisor"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:80
+msgid "Overview"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:81
+msgid "Password:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:82
+msgid "Pause"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:83
+msgid "Please wait..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:84
+msgid "Port:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:85
+msgid "Processor"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:86
+msgid "Randomly generated MAC address"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:87
+msgid "Read only connection"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:88
+msgid "Remote Xen host"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:89
+msgid "Restore a saved machine from a filesystem image"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:90
+msgid "Restore saved machine..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:91
+msgid "Run"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:92
+msgid "Save Domain"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:93
+msgid "Save domain"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:94
+msgid "Save this password in your keyring"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:95
+msgid "Saving VM Image"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:96
+msgid "Screenshot"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:97
+msgid "Shut down"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:99
+msgid "Specified MAC address:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:101
+msgid "Status:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:102
+msgid "Total memory on host machine:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:103
+msgid "URI:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:104
+msgid "UUID:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:105
+msgid "Unavailable"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:106
+msgid "Update status every"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:107
+msgid "Virtual CPUs"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:108
+msgid "Virtual Machine Console"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:109
+msgid "Virtual Machine Details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:110
+msgid "Virtual Machine Manager"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:111
+msgid "Virtual Machine Manager Preferences"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:112
+msgid "Virtual _Machine"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:113
+msgid "What is the maximum amount of memory this VM should be able to use?"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:114
+msgid "_Details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:115
+msgid "_Edit"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:116
+msgid "_File"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:117
+msgid "_Help"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:118
+msgid "_Mount Point (on virtual system):"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:119
+msgid "_Pause"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:120
+msgid "_Run"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:121
+msgid "_Save"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:122
+msgid "_Shutdown"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:123
+msgid "_Size:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:124
+msgid "_View"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:125
+msgid "_View:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:126
+msgid "mac-addr-random"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:127
+msgid "samples"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:128
+msgid "seconds"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:129
+msgid "state-host-cpus"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:130
+msgid "state-host-memory"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:132
+msgid "translator-credits"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:133
+msgid "virtual CPU alert"
+msgstr ""
diff --git a/po/virt-manager.pot b/po/virt-manager.pot
new file mode 100644
index 000000000..5458f1012
--- /dev/null
+++ b/po/virt-manager.pot
@@ -0,0 +1,640 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-08 11:58-0400\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../src/virt-manager.py.in:106
+msgid "Could not connection to session bus, disabling DBus service"
+msgstr ""
+
+#: ../../src/virtManager/config.py:177 ../../src/virtManager/config.py:191
+#: ../../src/virtManager/config.py:205
+msgid "Unable to access keyring"
+msgstr ""
+
+#: ../../src/virtManager/console.py:143
+msgid "Unable to activate console"
+msgstr ""
+
+#: ../../src/virtManager/console.py:189 ../../src/virtManager/details.py:167
+msgid "Shutdown requested, but machine is already shutting down / shutoff"
+msgstr ""
+
+#: ../../src/virtManager/console.py:197 ../../src/virtManager/details.py:175
+msgid "Pause/resume requested, but machine is shutdown / shutoff"
+msgstr ""
+
+#: ../../src/virtManager/console.py:203 ../../src/virtManager/details.py:181
+msgid "Pause requested, but machine is already paused"
+msgstr ""
+
+#: ../../src/virtManager/console.py:208 ../../src/virtManager/details.py:186
+msgid "Resume requested, but machine is already running"
+msgstr ""
+
+#: ../../src/virtManager/console.py:274
+msgid "paused"
+msgstr ""
+
+#: ../../src/virtManager/console.py:288
+msgid "Couldn't open console: "
+msgstr ""
+
+#: ../../src/virtManager/domain.py:252
+msgid "Running"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:254
+msgid "Paused"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:256 tmp/virt-manager.glade.h:98
+msgid "Shutdown"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:258
+msgid "Shutoff"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:260
+msgid "Crashed"
+msgstr ""
+
+#: ../../src/virtManager/domain.py:262
+msgid "Unknown status code"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:63
+#, python-format
+msgid "Unable to open connection to hypervisor URI '%s'"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:103
+#, python-format
+msgid "Error refreshing connection '%s'"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:212
+msgid "Save requested, but machine is shutdown / shutoff / paused"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:214
+msgid "Save Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/engine.py:227
+msgid "Saving Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:150
+msgid "Restore Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:164
+msgid "Restoring Virtual Machine"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:182
+#, python-format
+msgid "Error restoring domain '%s'. Is the domain already running?"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:278
+msgid "ID"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:279
+msgid "Name"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:280 tmp/virt-manager.glade.h:100
+msgid "Status"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:281 tmp/virt-manager.glade.h:39
+msgid "CPU usage"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:282
+msgid "VCPUs"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:283 tmp/virt-manager.glade.h:66
+msgid "Memory usage"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:284 tmp/virt-manager.glade.h:48
+msgid "Disk usage"
+msgstr ""
+
+#: ../../src/virtManager/manager.py:285 tmp/virt-manager.glade.h:72
+msgid "Network traffic"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:1
+msgid " free"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:2
+msgid " of "
+msgstr ""
+
+#: tmp/virt-manager.glade.h:3
+msgid "/tmp"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:4
+msgid "00:16:3e:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:5
+msgid "10 TB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:7
+#, no-c-format
+msgid "18%"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:8
+msgid "2 GB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:9
+msgid "20 bits/sec"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:10
+msgid "200 MB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:11
+msgid "256\t"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:12
+msgid "30 MB of 128 MB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:13
+msgid "80 MB of 1 GB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:14
+msgid ":"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:15
+msgid "<b>Basic details</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:16
+msgid "<b>CPUs</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:17
+msgid "<b>Memory</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:18
+msgid "<b>Network</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:19
+msgid "<b>Performance</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:20
+msgid "<b>Physical</b> host CPU count: "
+msgstr ""
+
+#: tmp/virt-manager.glade.h:21
+msgid "<b>Status monitoring</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:22
+msgid "<b>Storage</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:23
+msgid "<b>The console is currently unavailable</b>"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:24
+msgid ""
+"<b>Tip:</b> Acceptable values for hex digits are the numbers 0-9 and the "
+"letters A-F"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:25
+msgid ""
+"<b>Tip:</b> File location paths are as seen from the physical host. Mount "
+"points are as seen from the virtual machine."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:26
+msgid ""
+"<b>Tip:</b> For best performance, the number of virtual CPUs should be less "
+"than the number of physical CPUs on the host system."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:27
+msgid ""
+"<b>Tip:</b> You may only increase the size of file-based storage; you can't "
+"decrease its size."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:28
+msgid ""
+"<b>Too Many Virtual CPUs</b>\n"
+"\n"
+"You have set this virtual machine to have more CPUs than the host system has "
+"physically. This may result in poor performance in the virtual machine."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:31
+msgid "Add Virtual NIC"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:32
+msgid "Add hardware"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:33
+msgid "Add virtual NIC with:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:34
+msgid "Alert"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:35
+msgid ""
+"All virtual machines\n"
+"Active virtual machines\n"
+"Inactive virtual machines"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:38
+msgid "Auth"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:40
+msgid "CPU usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:41
+msgid "CPUs"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:42
+msgid "Connect"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:43
+msgid "Copyright (C) 2006 Red Hat Inc."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:44
+msgid "Current usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:45
+msgid "Delete machine"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:46
+msgid "Details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:47
+msgid "Disk"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:49
+msgid "Disk usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:50
+msgid "Domain ID"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:51
+msgid "Hardware"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:52
+msgid "Host:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:53
+msgid "How many <b>virtual</b> CPUs should this sytem have?"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:54
+msgid "Keep CPU Settings"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:55
+msgid "Launch _Terminal"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:56
+msgid "Local Xen host"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:57
+msgid "Login"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:58
+msgid ""
+"MB\n"
+"GB\n"
+"TB"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:61
+msgid "Machine console"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:62
+msgid "Machine details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:63
+msgid "Machine details..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:64
+msgid "Maintain history of"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:65
+msgid "Memory"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:67
+msgid "Memory usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:68
+msgid "Modify CPU Settings"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:69
+msgid "Modify File Storage"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:70
+msgid "Name:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:71
+msgid "Network"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:73
+msgid "Network usage:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:74
+msgid "New hardware configuration not available"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:75
+msgid "New machine..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:76
+msgid "Open connection"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:77
+msgid "Open connection..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:78
+msgid "Open terminal"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:79
+msgid "Other hypervisor"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:80
+msgid "Overview"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:81
+msgid "Password:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:82
+msgid "Pause"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:83
+msgid "Please wait..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:84
+msgid "Port:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:85
+msgid "Processor"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:86
+msgid "Randomly generated MAC address"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:87
+msgid "Read only connection"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:88
+msgid "Remote Xen host"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:89
+msgid "Restore a saved machine from a filesystem image"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:90
+msgid "Restore saved machine..."
+msgstr ""
+
+#: tmp/virt-manager.glade.h:91
+msgid "Run"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:92
+msgid "Save Domain"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:93
+msgid "Save domain"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:94
+msgid "Save this password in your keyring"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:95
+msgid "Saving VM Image"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:96
+msgid "Screenshot"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:97
+msgid "Shut down"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:99
+msgid "Specified MAC address:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:101
+msgid "Status:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:102
+msgid "Total memory on host machine:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:103
+msgid "URI:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:104
+msgid "UUID:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:105
+msgid "Unavailable"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:106
+msgid "Update status every"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:107
+msgid "Virtual CPUs"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:108
+msgid "Virtual Machine Console"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:109
+msgid "Virtual Machine Details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:110
+msgid "Virtual Machine Manager"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:111
+msgid "Virtual Machine Manager Preferences"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:112
+msgid "Virtual _Machine"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:113
+msgid "What is the maximum amount of memory this VM should be able to use?"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:114
+msgid "_Details"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:115
+msgid "_Edit"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:116
+msgid "_File"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:117
+msgid "_Help"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:118
+msgid "_Mount Point (on virtual system):"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:119
+msgid "_Pause"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:120
+msgid "_Run"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:121
+msgid "_Save"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:122
+msgid "_Shutdown"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:123
+msgid "_Size:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:124
+msgid "_View"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:125
+msgid "_View:"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:126
+msgid "mac-addr-random"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:127
+msgid "samples"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:128
+msgid "seconds"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:129
+msgid "state-host-cpus"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:130
+msgid "state-host-memory"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:132
+msgid "translator-credits"
+msgstr ""
+
+#: tmp/virt-manager.glade.h:133
+msgid "virtual CPU alert"
+msgstr ""
diff --git a/src/virt-manager.py.in b/src/virt-manager.py.in
index 6be416bc4..5a81294c3 100755
--- a/src/virt-manager.py.in
+++ b/src/virt-manager.py.in
@@ -28,9 +28,6 @@ import gettext
 gettext_app = "virt-manager"
 gettext_dir = "::GETTEXTDIR::"
 
-if os.path.exists(os.getcwd() + "/locale/en.po"):
-    gettext_dir = os.getcwd() + "/locale"
-
 locale.setlocale(locale.LC_ALL, '')
 gettext.install(gettext_app, gettext_dir)
 
diff --git a/virt-manager.spec.in b/virt-manager.spec.in
index 47b19a098..50c3ba241 100644
--- a/virt-manager.spec.in
+++ b/virt-manager.spec.in
@@ -52,11 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 make install  DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog NEWS
 %{_bindir}/%{name}
@@ -79,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/vncViewer/*.pyc
 %ghost %{_datadir}/%{name}/vncViewer/*.pyo
 
+
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/dbus-1/services/%{name}.service