diff --git a/.gitignore b/.gitignore
index 4e42f0f12..1aca52ba4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ daemon/transmission-proxy
 daemon/transmission-remote
 gtk/.depend
 gtk/defines.h
-gtk/po/*.mo
 gtk/transmission-gtk
 libtransmission/*.a
 libtransmission/.depend
@@ -22,3 +21,4 @@ macosx/Info.plist
 macosx/Transmission.app
 mk/config.mk
 mk/version.mk
+po/*.mo
diff --git a/Makefile.am b/Makefile.am
index 0f037ba61..f6e974f40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 if WITH_GTK
-  GTK_DIR = gtk
+  GTK_DIR = gtk po
 endif
 if HAVE_BEOS
   BEOS_DIR = beos
@@ -23,4 +23,5 @@ EXTRA_DIST = \
  AUTHORS \
  LICENSE \
  README \
- third-party
+ third-party \
+ intltool-extract.in intltool-merge.in intltool-update.in 
diff --git a/autogen.sh b/autogen.sh
index 5da70c8aa..41bd4b8b1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+GETTEXTIZE="glib-gettextize"
+$GETTEXTIZE --version < /dev/null > /dev/null 2>&1
+if test $? -ne 0; then
+    GETTEXTIZE=""
+fi
+
 LIBTOOLIZE=libtoolize
 if ! libtoolize --help >/dev/null 2>&1 && glibtoolize --help >/dev/null 2>&1
 then
@@ -8,3 +14,15 @@ fi
 export LIBTOOLIZE
 
 autoreconf -fi -I m4
+
+if test "$GETTEXTIZE"; then
+  echo "Creating aclocal.m4 ..."
+  test -r aclocal.m4 || touch aclocal.m4
+  echo "Running $GETTEXTIZE...  Ignore non-fatal messages."
+  echo "no" | $GETTEXTIZE --force --copy
+  echo "Making aclocal.m4 writable ..."
+  test -r aclocal.m4 && chmod u+w aclocal.m4
+  echo "Running intltoolize..."
+  intltoolize --copy --force --automake
+fi
+
diff --git a/configure.ac b/configure.ac
index 50d14e474..55f942832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Transmission],[0.82+],[http://transmission.m0k.org/trac/newticket])
+AC_INIT([transmission],[0.82+],[http://transmission.m0k.org/trac/newticket])
 PEERID_PREFIX="-TR082Z-"
 USERAGENT_PREFIX="0.82+"
 
@@ -29,14 +29,6 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 ACX_PTHREAD
 
-dnl AC_PROG_INTLTOOL([0.23],[no-xml])
-GETTEXT_PACKAGE=transmission
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-ALL_LINGUAS="bg es fi fr it pl ro ru sk sv"
-AM_GLIB_GNU_GETTEXT
-transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
-
 AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
 AC_CHECK_LIB([ssl],[SSL_library_init])
 AC_SEARCH_LIBS([socket], [socket net])
@@ -76,6 +68,15 @@ AM_CONDITIONAL([WITH_GTK],[test "x$use_gtk" = "xyes"])
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
+if test "x$use_gtk" = "xyes"; then
+    AC_PROG_INTLTOOL([0.23],[no-xml])
+    GETTEXT_PACKAGE=transmission
+    AC_SUBST(GETTEXT_PACKAGE)
+    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+    AM_GLIB_GNU_GETTEXT
+    transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
+    AC_SUBST(transmissionlocaledir)
+fi
 
 dnl ----------------------------------------------------------------------------
 dnl
@@ -190,7 +191,6 @@ AC_SUBST(BUNDLE_VERSION,[$SVN_REVISION])
 AC_SUBST(VERSION_PACKAGE,$USERAGENT_PREFIX-r$SVN_REVISION)
 
 
-
 dnl ----------------------------------------------------------------------------
 dnl
 dnl  Generate the output
@@ -206,7 +206,8 @@ AC_CONFIG_FILES([Makefile
                  third-party/Makefile
                  macosx/Makefile
                  wx/Makefile
-                 wx/images/Makefile])
+                 wx/images/Makefile
+                 po/Makefile.in])
 
 ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
 AC_OUTPUT
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b8d624301..e9b196f7e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir) \
     $(LIBEVENT_CPPFLAGS) \
     $(GTK_CFLAGS) \
-    -DLOCALEDIR=\""$(transmissionlocaledir)"\"
+    -DTRANSMISSIONLOCALEDIR=\""$(transmissionlocaledir)"\"
 
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 
@@ -52,3 +52,9 @@ transmission_LDADD = \
     $(top_builddir)/third-party/libevent/libevent.la \
     $(GTK_LIBS) \
     $(PTHREAD_LIBS) -lm
+
+Productivitydir = $(datadir)/applications
+Productivity_DATA = $(DESKTOP_FILES)
+
+icon_DATA = transmission.png
+icondir = $(datadir)/pixmaps
diff --git a/gtk/main.c b/gtk/main.c
index 7e67ad797..448d3c994 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -362,9 +362,9 @@ static void
 gtksetup( int * argc, char *** argv, struct cbdata * callback_data )
 {
 
-    bindtextdomain( "transmission-gtk", LOCALEDIR );
-    bind_textdomain_codeset( "transmission-gtk", "UTF-8" );
-    textdomain( "transmission-gtk" );
+    bindtextdomain( "transmission", TRANSMISSIONLOCALEDIR );
+    bind_textdomain_codeset( "transmission", "UTF-8" );
+    textdomain( "transmission" );
 
     g_set_application_name( _("Transmission") );
     gtk_init( argc, argv );
diff --git a/gtk/po/transmission-gtk.pot b/gtk/po/transmission-gtk.pot
deleted file mode 100644
index a7550956c..000000000
--- a/gtk/po/transmission-gtk.pot
+++ /dev/null
@@ -1,952 +0,0 @@
-# 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: 2007-08-08 18:28-0500\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=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: actions.c:39
-msgid "_High"
-msgstr ""
-
-#: actions.c:40
-msgid "_Normal"
-msgstr ""
-
-#: actions.c:41
-msgid "_Low"
-msgstr ""
-
-#: actions.c:56 makemeta-ui.c:249
-msgid "_File"
-msgstr ""
-
-#: actions.c:57
-msgid "_Edit"
-msgstr ""
-
-#: actions.c:58
-msgid "_Help"
-msgstr ""
-
-#: actions.c:59
-msgid "_Priority"
-msgstr ""
-
-#: actions.c:62
-msgid "_Start"
-msgstr ""
-
-#: actions.c:64
-msgid "Re_check"
-msgstr ""
-
-#: actions.c:66
-msgid "S_top"
-msgstr ""
-
-#: actions.c:68
-msgid "_Remove"
-msgstr ""
-
-#: actions.c:70
-msgid "_Create New Torrent"
-msgstr ""
-
-#: actions.c:72
-msgid "_Close"
-msgstr ""
-
-#: actions.c:74
-msgid "_Quit"
-msgstr ""
-
-#: actions.c:76
-msgid "Select _All"
-msgstr ""
-
-#: actions.c:78
-msgid "_Deselect All"
-msgstr ""
-
-#: actions.c:80
-msgid "Edit _Preferences"
-msgstr ""
-
-#: actions.c:82
-msgid "_Torrent Info"
-msgstr ""
-
-#: actions.c:84
-msgid "_About Transmission"
-msgstr ""
-
-#: actions.c:86
-msgid "Show _Debug Window"
-msgstr ""
-
-#: actions.c:88
-msgid "Show / Hide _Transmission"
-msgstr ""
-
-#: actions.c:90
-msgid "Update Tracker"
-msgstr ""
-
-#: conf.c:91 conf.c:371
-#, c-format
-msgid ""
-"Failed to open the file %s for writing:\n"
-"%s"
-msgstr ""
-
-#: conf.c:106
-#, c-format
-msgid "Another copy of %s is already running."
-msgstr ""
-
-#: conf.c:109
-#, c-format
-msgid ""
-"Failed to lock the file %s:\n"
-"%s"
-msgstr ""
-
-#: conf.c:132
-#, c-format
-msgid ""
-"Failed to create the directory %s:\n"
-"%s"
-msgstr ""
-
-#: conf.c:205
-#, c-format
-msgid ""
-"Failed to open the file %s for reading:\n"
-"%s"
-msgstr ""
-
-#: conf.c:212
-#, c-format
-msgid ""
-"Error while reading from the file %s:\n"
-"%s"
-msgstr ""
-
-#: conf.c:385
-#, c-format
-msgid ""
-"Error while writing to the file %s:\n"
-"%s"
-msgstr ""
-
-#: conf.c:391
-#, c-format
-msgid ""
-"Failed to rename the file %s to %s:\n"
-"%s"
-msgstr ""
-
-#: dialogs.c:118
-msgid "Add a Torrent"
-msgstr ""
-
-#: dialogs.c:125
-msgid "Automatically _start torrent"
-msgstr ""
-
-#: dialogs.c:127
-msgid "Use alternate _download directory"
-msgstr ""
-
-#: dialogs.c:131 tr_prefs.c:212
-msgid "Choose a download directory"
-msgstr ""
-
-#: dialogs.c:160
-msgid "Torrent files"
-msgstr ""
-
-#: dialogs.c:162
-msgid "All files"
-msgstr ""
-
-#: dialogs.c:258 torrent-inspector.c:414 torrent-inspector.c:839
-#: torrent-inspector.c:844
-msgid "?"
-msgstr ""
-
-#: dialogs.c:291
-msgid "Choose a directory"
-msgstr ""
-
-#: dialogs.c:415
-#, c-format
-msgid "<b>Really Quit %s?</b>"
-msgstr ""
-
-#: dialogs.c:419
-msgid "This will close all active torrents."
-msgstr ""
-
-#: dialogs.c:427
-msgid "_Don't Ask Me This Again"
-msgstr ""
-
-#: ipc.c:197
-#, c-format
-msgid ""
-"Failed to set up IPC:\n"
-"%s"
-msgstr ""
-
-#: ipc.c:229
-#, c-format
-msgid "failed to set up IPC: %s\n"
-msgstr ""
-
-#: ipc.c:309
-#, c-format
-msgid ""
-"Failed to set up socket:\n"
-"%s"
-msgstr ""
-
-#: ipc.c:332
-#, c-format
-msgid "failed to create socket: %s\n"
-msgstr ""
-
-#: ipc.c:341
-#, c-format
-msgid "failed to connect to %s: %s\n"
-msgstr ""
-
-#: ipc.c:431
-msgid "bad IPC protocol version"
-msgstr ""
-
-#: ipc.c:434
-msgid "IPC protocol parse error"
-msgstr ""
-
-#: ipc.c:437
-#, c-format
-msgid "IPC parsing failed: %s"
-msgstr ""
-
-#: ipc.c:467
-#, c-format
-msgid "bad IPC protocol version\n"
-msgstr ""
-
-#: ipc.c:470
-#, c-format
-msgid "IPC protocol parse error\n"
-msgstr ""
-
-#: ipc.c:473
-#, c-format
-msgid "IPC parsing failed: %s\n"
-msgstr ""
-
-#: main.c:316
-#, c-format
-msgid ""
-"usage: %s [-hpq] [files...]\n"
-"\n"
-"Transmission %s http://transmission.m0k.org/\n"
-"A free, lightweight BitTorrent client with a simple, intuitive interface\n"
-"\n"
-"  -h --help    display this message and exit\n"
-"  -p --paused  start with all torrents paused\n"
-"  -q --quit    request that the running %s instance quit\n"
-"\n"
-"Only one instance of %s may run at one time. Multiple\n"
-"torrent files may be loaded at startup by adding them to the command\n"
-"line. If %s is already running, those torrents will be\n"
-"opened in the running instance.\n"
-msgstr ""
-
-#: main.c:379
-msgid "Transmission"
-msgstr ""
-
-#: main.c:711
-#, c-format
-msgid ""
-"Failed to load torrent file:\n"
-"%s"
-msgid_plural ""
-"Failed to load torrent files:\n"
-"%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: main.c:918
-msgid "Copyright 2005-2007 The Transmission Project"
-msgstr ""
-
-#: main.c:920
-msgid "translator-credits"
-msgstr ""
-
-#: makemeta-ui.c:87
-msgid "Torrent creation aborted."
-msgstr ""
-
-#: makemeta-ui.c:88
-msgid "Torrent creation failed."
-msgstr ""
-
-#: makemeta-ui.c:99
-msgid "Torrent Created"
-msgstr ""
-
-#: makemeta-ui.c:130
-msgid "Making Torrent..."
-msgstr ""
-
-#: makemeta-ui.c:195
-msgid "file"
-msgid_plural "files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: makemeta-ui.c:202
-msgid "piece"
-msgid_plural "pieces"
-msgstr[0] ""
-msgstr[1] ""
-
-#: makemeta-ui.c:226
-msgid "Make a New Torrent"
-msgstr ""
-
-#: makemeta-ui.c:238
-msgid "Files"
-msgstr ""
-
-#: makemeta-ui.c:241
-msgid "File _Type"
-msgstr ""
-
-#: makemeta-ui.c:243
-msgid "Directory"
-msgstr ""
-
-#: makemeta-ui.c:245
-msgid "Single File"
-msgstr ""
-
-#: makemeta-ui.c:251
-msgid "File or Directory to Add to the New Torrent"
-msgstr ""
-
-#: makemeta-ui.c:262
-msgid "No Files Selected"
-msgstr ""
-
-#: makemeta-ui.c:276
-msgid "Torrent"
-msgstr ""
-
-#: makemeta-ui.c:279
-msgid "Private to this Tracker"
-msgstr ""
-
-#: makemeta-ui.c:282
-msgid "Announce _URL"
-msgstr ""
-
-#: makemeta-ui.c:287
-msgid "Commen_t"
-msgstr ""
-
-#: msgwin.c:159
-#, c-format
-msgid "Unable to open \"%s\" for writing: %s"
-msgstr ""
-
-#: msgwin.c:173
-#, c-format
-msgid "Error writing to \"%s\": %s"
-msgstr ""
-
-#: msgwin.c:190
-msgid "Save Debug Log"
-msgstr ""
-
-#: msgwin.c:215 torrent-inspector.c:896
-msgid "Error"
-msgstr ""
-
-#: msgwin.c:216
-msgid "Info"
-msgstr ""
-
-#: msgwin.c:217
-msgid "Debug"
-msgstr ""
-
-#: msgwin.c:244
-msgid "Save"
-msgstr ""
-
-#: msgwin.c:248
-msgid "Clear"
-msgstr ""
-
-#: msgwin.c:255
-msgid "Level "
-msgstr ""
-
-#: msgwin.c:256 msgwin.c:282
-msgid "Select the debug filter level."
-msgstr ""
-
-#: torrent-inspector.c:248
-msgid "Address"
-msgstr ""
-
-#: torrent-inspector.c:249
-msgid "Port"
-msgstr ""
-
-#: torrent-inspector.c:250
-msgid "Client"
-msgstr ""
-
-#: torrent-inspector.c:251 torrent-inspector.c:538 torrent-inspector.c:1356
-#: tr_window.c:206
-msgid "Progress"
-msgstr ""
-
-#: torrent-inspector.c:253
-msgid "Downloading"
-msgstr ""
-
-#: torrent-inspector.c:254
-msgid "DL Rate"
-msgstr ""
-
-#: torrent-inspector.c:255
-msgid "Uploading"
-msgstr ""
-
-#: torrent-inspector.c:256
-msgid "UL Rate"
-msgstr ""
-
-#: torrent-inspector.c:607
-msgid "Piece Availability"
-msgstr ""
-
-#: torrent-inspector.c:630
-msgid "Peers"
-msgstr ""
-
-#: torrent-inspector.c:647
-msgid "Seeders"
-msgstr ""
-
-#: torrent-inspector.c:655
-msgid "Leechers"
-msgstr ""
-
-#: torrent-inspector.c:663
-msgid "Completed"
-msgstr ""
-
-#: torrent-inspector.c:697
-msgid "Torrent Information"
-msgstr ""
-
-#: torrent-inspector.c:700
-msgid "Tracker"
-msgstr ""
-
-#: torrent-inspector.c:709
-msgid "Pieces"
-msgstr ""
-
-#: torrent-inspector.c:716
-msgid "Hash"
-msgstr ""
-
-#: torrent-inspector.c:720
-msgid "Secure"
-msgstr ""
-
-#: torrent-inspector.c:722
-msgid "Private Torrent, PEX disabled"
-msgstr ""
-
-#: torrent-inspector.c:723
-msgid "Public Torrent"
-msgstr ""
-
-#: torrent-inspector.c:727
-msgid "Comment"
-msgstr ""
-
-#: torrent-inspector.c:740
-msgid "Created By"
-msgstr ""
-
-#: torrent-inspector.c:743
-msgid "Creator"
-msgstr ""
-
-#: torrent-inspector.c:744 util.c:147
-msgid "N/A"
-msgstr ""
-
-#: torrent-inspector.c:747
-msgid "Date"
-msgstr ""
-
-#: torrent-inspector.c:754
-msgid "Location"
-msgstr ""
-
-#: torrent-inspector.c:757
-msgid "Downloaded Data"
-msgstr ""
-
-#: torrent-inspector.c:761
-msgid "Torrent File Path"
-msgstr ""
-
-#: torrent-inspector.c:767
-msgid "Torrent File Name"
-msgstr ""
-
-#: torrent-inspector.c:836
-msgid "None"
-msgstr ""
-
-#: torrent-inspector.c:865
-msgid "Transfer"
-msgstr ""
-
-#: torrent-inspector.c:868
-msgid "State"
-msgstr ""
-
-#: torrent-inspector.c:872
-msgid "Valid DL"
-msgstr ""
-
-#: torrent-inspector.c:876
-msgid "Downloaded"
-msgstr ""
-
-#: torrent-inspector.c:880
-msgid "Uploaded"
-msgstr ""
-
-#: torrent-inspector.c:884
-msgid "Ratio"
-msgstr ""
-
-#: torrent-inspector.c:888
-msgid "Remaining"
-msgstr ""
-
-#: torrent-inspector.c:892
-msgid "Swarm Rate"
-msgstr ""
-
-#: torrent-inspector.c:900
-msgid "Completeness"
-msgstr ""
-
-#: torrent-inspector.c:908
-msgid "Dates"
-msgstr ""
-
-#: torrent-inspector.c:911
-msgid "Added"
-msgstr ""
-
-#: torrent-inspector.c:915
-msgid "Last Activity"
-msgstr ""
-
-#: torrent-inspector.c:958 torrent-inspector.c:968 torrent-inspector.c:1139
-msgid "High"
-msgstr ""
-
-#: torrent-inspector.c:959 torrent-inspector.c:1141
-msgid "Normal"
-msgstr ""
-
-#: torrent-inspector.c:960 torrent-inspector.c:969 torrent-inspector.c:1143
-msgid "Low"
-msgstr ""
-
-#: torrent-inspector.c:1342
-msgid "File"
-msgstr ""
-
-#: torrent-inspector.c:1370
-msgid "Download"
-msgstr ""
-
-#: torrent-inspector.c:1380
-msgid "Priority"
-msgstr ""
-
-#: torrent-inspector.c:1501
-msgid "Transfer Bandwidth"
-msgstr ""
-
-#: torrent-inspector.c:1504
-msgid "Limit _Download Speed (KiB/s):"
-msgstr ""
-
-#: torrent-inspector.c:1517
-msgid "Limit _Upload Speed (KiB/s):"
-msgstr ""
-
-#: torrent-inspector.c:1531
-msgid "Seeding"
-msgstr ""
-
-#: torrent-inspector.c:1534
-msgid "_Stop Seeding at Ratio:"
-msgstr ""
-
-#: torrent-inspector.c:1599
-msgid "Torrent Inspector"
-msgstr ""
-
-#: torrent-inspector.c:1626
-msgid "_Activity"
-msgstr ""
-
-#: torrent-inspector.c:1631
-msgid "_Peers"
-msgstr ""
-
-#: torrent-inspector.c:1635
-msgid "_Info"
-msgstr ""
-
-#: torrent-inspector.c:1640
-msgid "_Files"
-msgstr ""
-
-#: torrent-inspector.c:1645
-msgid "_Options"
-msgstr ""
-
-#: tr_prefs.c:84
-msgid "_Limit download speed"
-msgstr ""
-
-#: tr_prefs.c:85
-msgid "Restrict the download rate"
-msgstr ""
-
-#: tr_prefs.c:89
-msgid "Maximum _download speed:"
-msgstr ""
-
-#: tr_prefs.c:90
-msgid "Speed in KiB/sec for restricted download rate"
-msgstr ""
-
-#: tr_prefs.c:94
-msgid "Li_mit upload speed"
-msgstr ""
-
-#: tr_prefs.c:95
-msgid "Restrict the upload rate"
-msgstr ""
-
-#: tr_prefs.c:99
-msgid "Maximum _upload speed:"
-msgstr ""
-
-#: tr_prefs.c:100
-msgid "Speed in KiB/sec for restricted upload rate"
-msgstr ""
-
-#: tr_prefs.c:104
-msgid "Al_ways prompt for download directory"
-msgstr ""
-
-#: tr_prefs.c:105
-msgid ""
-"When adding a torrent, always prompt for a directory to download data files "
-"into"
-msgstr ""
-
-#: tr_prefs.c:110
-msgid "Download di_rectory:"
-msgstr ""
-
-#: tr_prefs.c:111
-msgid "Destination directory for downloaded data files"
-msgstr ""
-
-#: tr_prefs.c:115
-msgid "Listening _port:"
-msgstr ""
-
-#: tr_prefs.c:116
-msgid "TCP port number to listen for peer connections"
-msgstr ""
-
-#: tr_prefs.c:120
-msgid "Au_tomatic port mapping via NAT-PMP or UPnP"
-msgstr ""
-
-#: tr_prefs.c:121
-msgid "Attempt to bypass NAT or firewall to allow incoming peer connections"
-msgstr ""
-
-#: tr_prefs.c:125
-msgid "Use peer _exchange if possible"
-msgstr ""
-
-#: tr_prefs.c:126
-msgid ""
-"Perform Azureus or µTorrent compatible peer exchange with any peers which "
-"support it"
-msgstr ""
-
-#: tr_prefs.c:131
-msgid "Display an _icon in the system tray"
-msgstr ""
-
-#: tr_prefs.c:132
-msgid "Use a system tray / dock / notification area icon"
-msgstr ""
-
-#: tr_prefs.c:136
-msgid "Confirm _quit"
-msgstr ""
-
-#: tr_prefs.c:137
-msgid "Prompt for confirmation when quitting"
-msgstr ""
-
-#: tr_prefs.c:142
-msgid "For torrents added _normally:"
-msgstr ""
-
-#: tr_prefs.c:143
-msgid "Torrent files added via the toolbar, popup menu, and drag-and-drop"
-msgstr ""
-
-#: tr_prefs.c:148
-msgid ""
-"For torrents added e_xternally\n"
-"(via the command-line):"
-msgstr ""
-
-#: tr_prefs.c:149
-msgid "For torrents added via the command-line only"
-msgstr ""
-
-#: tr_prefs.c:346
-#, c-format
-msgid "%s Preferences"
-msgstr ""
-
-#: tr_prefs.c:892
-msgid "Use the torrent file where it is"
-msgstr ""
-
-#: tr_prefs.c:895
-msgid "Keep a copy of the torrent file"
-msgstr ""
-
-#: tr_prefs.c:898
-msgid "Keep a copy and remove the original"
-msgstr ""
-
-#: tr_torrent.c:324 tr_torrent.c:437
-#, c-format
-msgid "%s: not a valid torrent file"
-msgstr ""
-
-#: tr_torrent.c:327 tr_torrent.c:440
-#, c-format
-msgid "%s: torrent is already open"
-msgstr ""
-
-#: tr_torrent.c:368
-msgid "not a valid torrent file"
-msgstr ""
-
-#: tr_torrent.c:371
-msgid "torrent is already open"
-msgstr ""
-
-#: tr_torrent.c:562
-#, c-format
-msgid "Waiting to check existing files (checked %.1f%%)"
-msgstr ""
-
-#: tr_torrent.c:567
-#, c-format
-msgid "Checking existing files (checked %.1f%%)"
-msgstr ""
-
-#: tr_torrent.c:572
-#, c-format
-msgid "Stalled (%.1f%%)"
-msgstr ""
-
-#: tr_torrent.c:575
-#, c-format
-msgid "%s remaining (%.1f%%)"
-msgstr ""
-
-#: tr_torrent.c:582
-#, c-format
-msgid "Uploading to %d of %d peer"
-msgid_plural "Uploading to %d of %d peers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: tr_torrent.c:589
-#, c-format
-msgid "Seeding to %d of %d peer"
-msgid_plural "Seeding to %d of %d peers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: tr_torrent.c:595
-msgid "Stopping..."
-msgstr ""
-
-#: tr_torrent.c:599
-#, c-format
-msgid "Stopped (%.1f%%)"
-msgstr ""
-
-#: tr_window.c:101
-msgid "Error: "
-msgstr ""
-
-#: tr_window.c:106
-#, c-format
-msgid "Downloading from %i of %i peer"
-msgid_plural "Downloading from %i of %i peers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: tr_window.c:144
-#, c-format
-msgid ""
-"Ratio: %s\n"
-"UL: %s"
-msgstr ""
-
-#: tr_window.c:149
-#, c-format
-msgid ""
-"DL: %s\n"
-"UL: %s"
-msgstr ""
-
-#: tr_window.c:192
-msgid "Name"
-msgstr ""
-
-#: tr_window.c:203
-msgid "  fnord    fnord  "
-msgstr ""
-
-#: tr_window.c:309
-#, c-format
-msgid "Total DL: %s"
-msgstr ""
-
-#: tr_window.c:315
-#, c-format
-msgid "Total UL: %s"
-msgstr ""
-
-#: util.c:77
-msgid "B"
-msgstr ""
-
-#: util.c:77
-msgid "KiB"
-msgstr ""
-
-#: util.c:77
-msgid "MiB"
-msgstr ""
-
-#: util.c:77
-msgid "GiB"
-msgstr ""
-
-#: util.c:77
-msgid "TiB"
-msgstr ""
-
-#: util.c:77
-msgid "PiB"
-msgstr ""
-
-#: util.c:77
-msgid "EiB"
-msgstr ""
-
-#: util.c:116
-#, c-format
-msgid "%i %s"
-msgstr ""
-
-#: util.c:117 util.c:121
-msgid "sec"
-msgid_plural "secs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: util.c:119 util.c:123 util.c:127
-#, c-format
-msgid "%i %s %i %s"
-msgstr ""
-
-#: util.c:120 util.c:125
-msgid "min"
-msgid_plural "mins"
-msgstr[0] ""
-msgstr[1] ""
-
-#: util.c:124 util.c:129
-msgid "hr"
-msgid_plural "hrs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: util.c:128
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: util.c:151
-msgid "∞"
-msgstr ""
diff --git a/gtk/transmission.desktop b/gtk/transmission.desktop
deleted file mode 100644
index 0c51a5c45..000000000
--- a/gtk/transmission.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Transmission BitTorrent Client
-Type=Application
-Comment=A free, lightweight BitTorrent client with a simple, intuitive interface
-Comment[bg]=Свободен, лек BitTorrent клиент с прост, интуитивен интерфейс
-Comment[es]=Un cliente libre, ligero de BitTorrent con una interfaz simple e intuitiva
-Comment[fi]=Ilmainen, kevytkäyttöinen BitTorrent ohjelma jossa on helppokäyttöinen käyttöliittymä
-Comment[fr]=Un client BitTorrent léger, libre, avec une interface simple et intuitive
-Comment[it]=Un client BitTorrent libero e leggero con un'interfaccia semplice ed intuitiva
-Comment[pl]=Darmowy, lekki klient BitTorrent z prostym, intuicyjnym interfejscem
-Comment[ro]=Un client BitTorrent liber, neîncărcat, cu o interfaţă simplă şi intuitivă
-Comment[ru]=Свободный, легковесный BitTorrent клиент с простым, интуитивным интерфейсом
-Comment[sv]=En fri, lättviktig BitTorrent-klient med ett enkelt och intuitivt gränssnitt
-Exec=transmission %F
-TryExec=transmission
-Icon=transmission.png
-MimeType=application/x-bittorrent;
-Categories=Network;FileTransfer;P2P;GTK;
diff --git a/gtk/transmission.desktop.in b/gtk/transmission.desktop.in
new file mode 100644
index 000000000..0f1696938
--- /dev/null
+++ b/gtk/transmission.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Transmission BitTorrent Client
+_Comment=A free, lightweight BitTorrent client with a simple, intuitive interface
+Exec=transmission %F
+Icon=transmission.png
+Terminal=false
+TryExec=transmission
+Type=Application
+MimeType=application/x-bittorrent;
+Categories=Network;FileTransfer;P2P;GTK;
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 000000000..9af90c43e
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,2 @@
+# Set of available languages.
+es fi fr it nl pl pt_BR pt ro ru sk sv
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 000000000..115bb8a01
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,19 @@
+[encoding: UTF-8]
+gtk/transmission.desktop.in
+gtk/actions.c
+gtk/conf.c
+gtk/dialogs.c
+gtk/hig.c
+gtk/io.c
+gtk/ipc.c
+gtk/main.c
+gtk/makemeta-ui.c
+gtk/msgwin.c
+gtk/torrent-inspector.c
+gtk/tr_cell_renderer_progress.c
+gtk/tr_core.c
+gtk/tr_icon.c
+gtk/tr_prefs.c
+gtk/tr_torrent.c
+gtk/tr_window.c
+gtk/util.c
diff --git a/gtk/po/bg.po b/po/bg.po
similarity index 100%
rename from gtk/po/bg.po
rename to po/bg.po
diff --git a/gtk/po/build-pot.sh b/po/build-pot.sh
similarity index 100%
rename from gtk/po/build-pot.sh
rename to po/build-pot.sh
diff --git a/gtk/po/es.po b/po/es.po
similarity index 100%
rename from gtk/po/es.po
rename to po/es.po
diff --git a/gtk/po/fi.po b/po/fi.po
similarity index 100%
rename from gtk/po/fi.po
rename to po/fi.po
diff --git a/gtk/po/fr.po b/po/fr.po
similarity index 100%
rename from gtk/po/fr.po
rename to po/fr.po
diff --git a/gtk/po/it.po b/po/it.po
similarity index 100%
rename from gtk/po/it.po
rename to po/it.po
diff --git a/gtk/po/nl.po b/po/nl.po
similarity index 100%
rename from gtk/po/nl.po
rename to po/nl.po
diff --git a/gtk/po/pl.po b/po/pl.po
similarity index 100%
rename from gtk/po/pl.po
rename to po/pl.po
diff --git a/gtk/po/pt.po b/po/pt.po
similarity index 100%
rename from gtk/po/pt.po
rename to po/pt.po
diff --git a/gtk/po/pt_BR.po b/po/pt_BR.po
similarity index 100%
rename from gtk/po/pt_BR.po
rename to po/pt_BR.po
diff --git a/gtk/po/ro.po b/po/ro.po
similarity index 100%
rename from gtk/po/ro.po
rename to po/ro.po
diff --git a/gtk/po/ru.po b/po/ru.po
similarity index 100%
rename from gtk/po/ru.po
rename to po/ru.po
diff --git a/gtk/po/sk.po b/po/sk.po
similarity index 100%
rename from gtk/po/sk.po
rename to po/sk.po
diff --git a/gtk/po/sv.po b/po/sv.po
similarity index 100%
rename from gtk/po/sv.po
rename to po/sv.po