use a gtktable for general panel, fixed layout is no good for a localised app. add JDM's freebsd port.

12 files changed, 569 insertions, 464 deletions

diff --git a/freebsd/Makefile b/freebsd/Makefile
new file mode 100644
index 0000000..b58e986
--- /dev/null
+++ b/freebsd/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	transmission-remote-gtk
+# Date created:			22 February 2011
+# Whom:				J.D. Morris <jdm720@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	transmission-remote-gtk
+PORTVERSION=	0.2.2
+CATEGORIES=	net-p2p
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+
+MAINTAINER=	jdm720@gmail.com
+COMMENT=	GTK app for remote management of Transmission via RPC
+
+LIB_DEPENDS=	json-glib-1.0:${PORTSDIR}/devel/json-glib \
+		notify.1:${PORTSDIR}/devel/libnotify \
+		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
+		curl.6:${PORTSDIR}/ftp/curl
+
+RUN_DEPENDS=	notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+
+USE_GNOME=		glib20 gtk20 gconf2
+GNU_CONFIGURE=		yes
+INSTALLS_ICONS=		yes
+GCONF_SCHEMAS=		transmission-remote-gtk.schemas
+
+.include <bsd.port.pre.mk>
+
+.include <bsd.port.post.mk>
diff --git a/freebsd/distinfo b/freebsd/distinfo
new file mode 100644
index 0000000..4bc2e74
--- /dev/null
+++ b/freebsd/distinfo
@@ -0,0 +1,2 @@
+SHA256 (transmission-remote-gtk-0.2.1.tar.gz) = 3377b6f4d821f1852d935933fc1f04e4c024e21d3d42292985e3358033708221
+SIZE (transmission-remote-gtk-0.2.1.tar.gz) = 210822
diff --git a/freebsd/pkg-descr b/freebsd/pkg-descr
new file mode 100644
index 0000000..dbe0608
--- /dev/null
+++ b/freebsd/pkg-descr
@@ -0,0 +1,11 @@
+transmission-remote-gtk is a GTK application for remote management of the
+Transmission BitTorrent client via its RPC interface.
+
+- Remotely add (file/url), start, stop, remove, remove & delete, verify
+  torrents.
+- Works as a .torrent handler (eg. from a web browser).
+- Set torrent properties such as speed, seed, and peer limits.
+- Change remote settings like global limits, download directory, and
+  connectivity preferences.
+
+WWW: http://code.google.com/p/transmission-remote-gtk/
diff --git a/freebsd/pkg-plist b/freebsd/pkg-plist
new file mode 100644
index 0000000..d0c2f03
--- /dev/null
+++ b/freebsd/pkg-plist
@@ -0,0 +1,8 @@
+bin/transmission-remote-gtk
+share/icons/hicolor/scalable/apps/transmission-remote-gtk.svg
+share/icons/hicolor/16x16/apps/transmission-remote-gtk.png
+share/icons/hicolor/24x24/apps/transmission-remote-gtk.png
+share/icons/hicolor/48x48/apps/transmission-remote-gtk.png
+share/icons/hicolor/22x22/apps/transmission-remote-gtk.png
+share/icons/hicolor/32x32/apps/transmission-remote-gtk.png
+share/applications/transmission-remote-gtk.desktop
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e69de29..99fbbf8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -0,0 +1,20 @@
+src/trg-about-window.c
+src/trg-cell-renderer-wanted.c
+src/trg-files-tree-view.c
+src/trg-general-panel.c
+src/trg-main-window.c
+src/trg-menu-bar.c
+src/trg-peers-tree-view.c
+src/trg-preferences-dialog.c
+src/trg-remote-prefs-dialog.c
+src/trg-state-selector.c
+src/trg-stats-dialog.c
+src/trg-status-bar.c
+src/trg-toolbar.c
+src/trg-torrent-add-url-dialog.c
+src/trg-torrent-graph.c
+src/trg-torrent-move-dialog.c
+src/trg-torrent-props-dialog.c
+src/trg-torrent-tree-view.c
+src/trg-trackers-tree-view.c
+src/util.c
diff --git a/po/de.po b/po/de.po
index 155a4b5..0d38514 100644
--- a/po/de.po
+++ b/po/de.po
@@ -855,3 +855,7 @@ msgstr "_Hilfe"
 #: src/trg-menu-bar.c:327
 msgid "_About"
 msgstr "Ü_ber"
+
+#: src/trg-preferences-dialog.c:237
+msgid "Show graph"
+msgstr "Zeigen graph"
diff --git a/po/transmission-remote-gtk.pot b/po/transmission-remote-gtk.pot
index ec457f0..c886b1a 100644
--- a/po/transmission-remote-gtk.pot
+++ b/po/transmission-remote-gtk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 23:15+0000\n"
+"POT-Creation-Date: 2011-03-08 22:04+0000\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"
@@ -18,840 +18,848 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/trg-preferences-dialog.c:227
-msgid "System Tray"
+#: src/trg-about-window.c:60
+msgid "A remote client to transmission-daemon."
 msgstr ""
 
-#: src/trg-preferences-dialog.c:229
-msgid "Show in system tray"
+#: src/trg-cell-renderer-wanted.c:67
+msgid "Yes"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:235
-msgid "Minimise to system tray"
+#: src/trg-cell-renderer-wanted.c:69
+msgid "No"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:244
-msgid "Torrent added notifications"
+#: src/trg-files-tree-view.c:253
+msgid "High Priority"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:253
-msgid "Torrent complete notifications"
+#: src/trg-files-tree-view.c:257
+msgid "Normal Priority"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:273
-msgid "Server"
+#: src/trg-files-tree-view.c:262
+msgid "Low Priority"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:276
-msgid "Host:"
+#: src/trg-files-tree-view.c:273
+msgid "Download"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:279
-msgid "Port:"
+#: src/trg-files-tree-view.c:282
+msgid "Skip"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:281
-msgid "Automatically connect"
+#: src/trg-files-tree-view.c:364 src/trg-general-panel.c:229
+#: src/trg-torrent-tree-view.c:40
+msgid "Name"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:285
-msgid "SSL"
+#: src/trg-files-tree-view.c:365 src/trg-general-panel.c:232
+#: src/trg-torrent-tree-view.c:42
+msgid "Size"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:291
-msgid "Update interval:"
+#: src/trg-files-tree-view.c:367 src/trg-peers-tree-view.c:59
+msgid "Progress"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:294
-msgid "Authentication"
+#: src/trg-files-tree-view.c:369
+msgid "Wanted"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:297
-msgid "Username:"
+#: src/trg-files-tree-view.c:372
+msgid "Priority"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:301
-msgid "Password:"
+#: src/trg-general-panel.c:158 src/trg-state-selector.c:147 src/util.c:46
+msgid "Error"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:328 src/trg-toolbar.c:256
-msgid "Local Preferences"
+#: src/trg-general-panel.c:170
+msgid "N/A"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:340
-msgid "Connection"
+#: src/trg-general-panel.c:234 src/trg-torrent-tree-view.c:56
+msgid "ETA"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:344
-msgid "Desktop"
+#: src/trg-general-panel.c:236
+msgid "Completed"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:218 src/trg-torrent-props-dialog.c:173
-msgid "Bandwidth"
+#: src/trg-general-panel.c:239
+msgid "Seeders"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:221
-msgid "Limit download speed (KB/s)"
+#: src/trg-general-panel.c:241
+msgid "Rate Down"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:240
-msgid "Limit upload speed (KB/s)"
+#: src/trg-general-panel.c:243 src/trg-torrent-tree-view.c:60
+msgid "Downloaded"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:257 src/trg-state-selector.c:143
-#: src/trg-torrent-props-dialog.c:217
-msgid "Seeding"
+#: src/trg-general-panel.c:246 src/trg-torrent-tree-view.c:50
+msgid "Leechers"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:260
-msgid "Seed ratio limit"
+#: src/trg-general-panel.c:248
+msgid "Rate Up"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:277 src/trg-main-window.c:823
-#: src/trg-torrent-props-dialog.c:239
-msgid "Peers"
+#: src/trg-general-panel.c:250 src/trg-torrent-tree-view.c:58
+msgid "Uploaded"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:284
-msgid "Global peer limit"
+#: src/trg-general-panel.c:253 src/trg-torrent-tree-view.c:46
+msgid "Status"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:291
-msgid "Per torrent peer limit"
+#: src/trg-general-panel.c:255 src/trg-torrent-tree-view.c:62
+msgid "Ratio"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:305
-msgid "Retest"
+#: src/trg-general-panel.c:258
+msgid "Location"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:314
-msgid "Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"
+#: src/trg-main-window.c:427
+msgid "BitTorrent Metadata"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:317
-msgid "Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"
+#: src/trg-main-window.c:513
+msgid ""
+"Unable to retrieve connection settings from GConf. Schema not installed?"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:333 src/trg-remote-prefs-dialog.c:417
-msgid "Port test"
+#: src/trg-main-window.c:516
+msgid "No hostname set"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:334
-msgid "Testing..."
+#: src/trg-main-window.c:519
+msgid "Unknown error getting settings"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:356 src/trg-remote-prefs-dialog.c:448
-#, c-format
-msgid "Blocklist (%ld entries)"
+#: src/trg-main-window.c:537
+msgid "Connecting..."
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:379
-msgid "Updating..."
+#: src/trg-main-window.c:708
+#, c-format
+msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:398
-msgid "Required"
+#: src/trg-main-window.c:709
+#, c-format
+msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:399
-msgid "Preferred"
+#: src/trg-main-window.c:733
+#, c-format
+msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:400
-msgid "Tolerated"
+#: src/trg-main-window.c:734
+#, c-format
+msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:409
-msgid "Encryption"
+#: src/trg-main-window.c:804 src/trg-remote-prefs-dialog.c:612
+msgid "General"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:415
-msgid "Peer port"
+#: src/trg-main-window.c:812
+msgid "Trackers"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:418
-msgid "Test"
+#: src/trg-main-window.c:820
+msgid "Files"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:424
-msgid "Random peer port on start"
+#: src/trg-main-window.c:827 src/trg-remote-prefs-dialog.c:277
+#: src/trg-torrent-props-dialog.c:242
+msgid "Peers"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:430
-msgid "Peer port forwarding"
+#: src/trg-main-window.c:929
+#, c-format
+msgid "Request %d/%d failed: %s"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:437
-msgid "Peer exchange (PEX)"
+#: src/trg-main-window.c:1442
+msgid "No Limit"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:443
-msgid "Local peer discovery"
+#: src/trg-main-window.c:1479 src/trg-toolbar.c:238
+msgid "Properties"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:458
-msgid "Update"
+#: src/trg-main-window.c:1482 src/trg-toolbar.c:231
+msgid "Resume"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:474
-msgid "Blocklist URL:"
+#: src/trg-main-window.c:1485 src/trg-toolbar.c:234
+msgid "Pause"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:495
-msgid "Download directory"
+#: src/trg-main-window.c:1488
+msgid "Verify"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:498
-msgid "Incomplete download dir"
+#: src/trg-main-window.c:1491
+msgid "Re-announce"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:514
-msgid "Torrent done script"
+#: src/trg-main-window.c:1494 src/trg-torrent-move-dialog.c:99
+#: src/trg-torrent-move-dialog.c:106
+msgid "Move"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:535
-msgid "Cache size (MB)"
+#: src/trg-main-window.c:1497 src/trg-menu-bar.c:307 src/trg-toolbar.c:242
+msgid "Remove"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:540
-msgid "Rename partial files"
+#: src/trg-main-window.c:1500
+msgid "Remove & Delete"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:547
-msgid "Trash original torrent files"
+#: src/trg-main-window.c:1506 src/trg-main-window.c:1550
+msgid "Down Limit"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:554
-msgid "Start added torrents"
+#: src/trg-main-window.c:1511 src/trg-main-window.c:1555
+msgid "Up Limit"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:580 src/trg-toolbar.c:260
-msgid "Remote Preferences"
+#: src/trg-main-window.c:1533 src/trg-toolbar.c:215
+msgid "Connect"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:608 src/trg-main-window.c:800
-msgid "General"
+#: src/trg-main-window.c:1537 src/trg-toolbar.c:218
+msgid "Disconnect"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:613
-msgid "Connections"
+#: src/trg-main-window.c:1541 src/trg-toolbar.c:221
+#: src/trg-trackers-tree-view.c:251 src/trg-trackers-tree-view.c:278
+msgid "Add"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:618 src/trg-torrent-props-dialog.c:313
-msgid "Limits"
+#: src/trg-main-window.c:1544
+msgid "Add from URL"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:48
-msgid "IP"
+#: src/trg-main-window.c:1684
+msgid "Graph"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:49
-msgid "Host"
+#: src/trg-menu-bar.c:208
+msgid "_View"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:52
-msgid "Country"
+#: src/trg-menu-bar.c:213
+msgid "State selector"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:55 src/trg-torrent-tree-view.c:51
-msgid "Down Speed"
+#: src/trg-menu-bar.c:218
+msgid "Torrent _details"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:57 src/trg-torrent-tree-view.c:53
-msgid "Up Speed"
+#: src/trg-menu-bar.c:223
+msgid "_Statistics"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:59 src/trg-files-tree-view.c:366
-msgid "Progress"
+#: src/trg-menu-bar.c:237
+msgid "_Options"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:61
-msgid "Flags"
+#: src/trg-menu-bar.c:243
+msgid "_Local Preferences"
 msgstr ""
 
-#: src/trg-peers-tree-view.c:62
-msgid "Client"
+#: src/trg-menu-bar.c:248
+msgid "_Remote Preferences"
 msgstr ""
 
-#: src/trg-state-selector.c:131
-msgid "All"
+#: src/trg-menu-bar.c:257
+msgid "_File"
 msgstr ""
 
-#: src/trg-state-selector.c:133
-msgid "Downloading"
+#: src/trg-menu-bar.c:262
+msgid "_Connect"
 msgstr ""
 
-#: src/trg-state-selector.c:135
-msgid "Paused"
+#: src/trg-menu-bar.c:265
+msgid "_Disconnect"
 msgstr ""
 
-#: src/trg-state-selector.c:137
-msgid "Checking"
+#: src/trg-menu-bar.c:268
+msgid "_Add"
 msgstr ""
 
-#: src/trg-state-selector.c:139
-msgid "Complete"
+#: src/trg-menu-bar.c:271
+msgid "Add from _URL"
 msgstr ""
 
-#: src/trg-state-selector.c:141
-msgid "Incomplete"
+#: src/trg-menu-bar.c:275
+msgid "_Quit"
 msgstr ""
 
-#: src/trg-state-selector.c:145 src/util.c:46 src/trg-general-panel.c:156
-msgid "Error"
+#: src/trg-menu-bar.c:284
+msgid "_Torrent"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:40 src/trg-general-panel.c:212
-#: src/trg-files-tree-view.c:364
-msgid "Name"
+#: src/trg-menu-bar.c:292
+msgid "_Resume"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:41 src/trg-general-panel.c:215
-#: src/trg-files-tree-view.c:365
-msgid "Size"
+#: src/trg-menu-bar.c:295
+msgid "_Pause"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:43
-msgid "Done"
+#: src/trg-menu-bar.c:298
+msgid "_Verify"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:45 src/trg-general-panel.c:235
-msgid "Status"
+#: src/trg-menu-bar.c:302
+msgid "Re-_announce"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:47
-msgid "Seeds"
+#: src/trg-menu-bar.c:304
+msgid "_Move"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:49 src/trg-general-panel.c:228
-msgid "Leechers"
+#: src/trg-menu-bar.c:311
+msgid "Remove and Delete"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:55 src/trg-general-panel.c:216
-msgid "ETA"
+#: src/trg-menu-bar.c:322
+msgid "_Help"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:57 src/trg-general-panel.c:232
-msgid "Uploaded"
+#: src/trg-menu-bar.c:328
+msgid "_About"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:59 src/trg-general-panel.c:225
-msgid "Downloaded"
+#: src/trg-peers-tree-view.c:48
+msgid "IP"
 msgstr ""
 
-#: src/trg-torrent-tree-view.c:61 src/trg-general-panel.c:237
-msgid "Ratio"
+#: src/trg-peers-tree-view.c:49
+msgid "Host"
 msgstr ""
 
-#: src/trg-main-window.c:427
-msgid "BitTorrent Metadata"
+#: src/trg-peers-tree-view.c:52
+msgid "Country"
 msgstr ""
 
-#: src/trg-main-window.c:512
-msgid ""
-"Unable to retrieve connection settings from GConf. Schema not installed?"
+#: src/trg-peers-tree-view.c:55 src/trg-torrent-tree-view.c:52
+msgid "Down Speed"
 msgstr ""
 
-#: src/trg-main-window.c:515
-msgid "No hostname set"
+#: src/trg-peers-tree-view.c:57 src/trg-torrent-tree-view.c:54
+msgid "Up Speed"
 msgstr ""
 
-#: src/trg-main-window.c:518
-msgid "Unknown error getting settings"
+#: src/trg-peers-tree-view.c:61
+msgid "Flags"
 msgstr ""
 
-#: src/trg-main-window.c:535
-msgid "Connecting..."
+#: src/trg-peers-tree-view.c:63
+msgid "Client"
 msgstr ""
 
-#: src/trg-main-window.c:706
-#, c-format
-msgid "<big><b>Remove torrent \"%s\"?</b></big>"
+#: src/trg-preferences-dialog.c:235
+msgid "Features"
 msgstr ""
 
-#: src/trg-main-window.c:707
-#, c-format
-msgid "<big><b>Remove %d torrents?</b></big>"
+#: src/trg-preferences-dialog.c:237
+msgid "Show graph"
 msgstr ""
 
-#: src/trg-main-window.c:731
-#, c-format
-msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
+#: src/trg-preferences-dialog.c:242
+msgid "System Tray"
 msgstr ""
 
-#: src/trg-main-window.c:732
-#, c-format
-msgid "<big><b>Remove and delete %d torrents?</b></big>"
+#: src/trg-preferences-dialog.c:244
+msgid "Show in system tray"
 msgstr ""
 
-#: src/trg-main-window.c:808
-msgid "Trackers"
+#: src/trg-preferences-dialog.c:250
+msgid "Minimise to system tray"
 msgstr ""
 
-#: src/trg-main-window.c:816
-msgid "Files"
+#: src/trg-preferences-dialog.c:259
+msgid "Torrent added notifications"
 msgstr ""
 
-#: src/trg-main-window.c:828
-msgid "Graph"
+#: src/trg-preferences-dialog.c:268
+msgid "Torrent complete notifications"
 msgstr ""
 
-#: src/trg-main-window.c:916
-#, c-format
-msgid "Request %d/%d failed: %s"
+#: src/trg-preferences-dialog.c:288
+msgid "Server"
 msgstr ""
 
-#: src/trg-main-window.c:1415
-msgid "No Limit"
+#: src/trg-preferences-dialog.c:291
+msgid "Host:"
 msgstr ""
 
-#: src/trg-main-window.c:1452 src/trg-toolbar.c:237
-msgid "Properties"
+#: src/trg-preferences-dialog.c:294
+msgid "Port:"
 msgstr ""
 
-#: src/trg-main-window.c:1455 src/trg-toolbar.c:230
-msgid "Resume"
+#: src/trg-preferences-dialog.c:296
+msgid "Automatically connect"
 msgstr ""
 
-#: src/trg-main-window.c:1458 src/trg-toolbar.c:233
-msgid "Pause"
+#: src/trg-preferences-dialog.c:300
+msgid "SSL"
 msgstr ""
 
-#: src/trg-main-window.c:1461
-msgid "Verify"
+#: src/trg-preferences-dialog.c:306
+msgid "Update interval:"
 msgstr ""
 
-#: src/trg-main-window.c:1464
-msgid "Re-announce"
+#: src/trg-preferences-dialog.c:309
+msgid "Authentication"
 msgstr ""
 
-#: src/trg-main-window.c:1467 src/trg-torrent-move-dialog.c:99
-#: src/trg-torrent-move-dialog.c:106
-msgid "Move"
+#: src/trg-preferences-dialog.c:312
+msgid "Username:"
 msgstr ""
 
-#: src/trg-main-window.c:1469 src/trg-toolbar.c:241 src/trg-menu-bar.c:306
-msgid "Remove"
+#: src/trg-preferences-dialog.c:316
+msgid "Password:"
 msgstr ""
 
-#: src/trg-main-window.c:1471
-msgid "Remove & Delete"
+#: src/trg-preferences-dialog.c:343 src/trg-toolbar.c:257
+msgid "Local Preferences"
 msgstr ""
 
-#: src/trg-main-window.c:1477 src/trg-main-window.c:1519
-msgid "Down Limit"
+#: src/trg-preferences-dialog.c:355
+msgid "Connection"
 msgstr ""
 
-#: src/trg-main-window.c:1481 src/trg-main-window.c:1524
-msgid "Up Limit"
+#: src/trg-preferences-dialog.c:359
+msgid "Desktop"
 msgstr ""
 
-#: src/trg-main-window.c:1503 src/trg-toolbar.c:215
-msgid "Connect"
+#: src/trg-remote-prefs-dialog.c:218 src/trg-torrent-props-dialog.c:175
+msgid "Bandwidth"
 msgstr ""
 
-#: src/trg-main-window.c:1507 src/trg-toolbar.c:218
-msgid "Disconnect"
+#: src/trg-remote-prefs-dialog.c:221
+msgid "Limit download speed (KB/s)"
 msgstr ""
 
-#: src/trg-main-window.c:1511 src/trg-trackers-tree-view.c:251
-#: src/trg-trackers-tree-view.c:278 src/trg-toolbar.c:221
-msgid "Add"
+#: src/trg-remote-prefs-dialog.c:240
+msgid "Limit upload speed (KB/s)"
 msgstr ""
 
-#: src/trg-main-window.c:1513
-msgid "Add from URL"
+#: src/trg-remote-prefs-dialog.c:257 src/trg-state-selector.c:145
+#: src/trg-torrent-props-dialog.c:219
+msgid "Seeding"
 msgstr ""
 
-#: src/trg-torrent-add-url-dialog.c:89
-msgid "Start Paused"
+#: src/trg-remote-prefs-dialog.c:260
+msgid "Seed ratio limit"
 msgstr ""
 
-#: src/trg-torrent-add-url-dialog.c:91
-msgid "Add torrent from URL"
+#: src/trg-remote-prefs-dialog.c:284
+msgid "Global peer limit"
 msgstr ""
 
-#: src/util.c:55
-msgid "JSON decoding error."
+#: src/trg-remote-prefs-dialog.c:291
+msgid "Per torrent peer limit"
 msgstr ""
 
-#: src/util.c:60
-msgid "Server responded, but with no result."
+#: src/trg-remote-prefs-dialog.c:306
+msgid "Retest"
 msgstr ""
 
-#: src/util.c:64
-#, c-format
-msgid "Request failed with HTTP code %d"
+#: src/trg-remote-prefs-dialog.c:316
+msgid "Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"
 msgstr ""
 
-#: src/util.c:127
-msgid "None"
+#: src/trg-remote-prefs-dialog.c:320
+msgid "Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"
 msgstr ""
 
-#: src/util.c:137
-#, c-format
-msgid "%'u byte"
-msgid_plural "%'u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/util.c:143
-#, c-format
-msgid "%'.1f KB"
+#: src/trg-remote-prefs-dialog.c:336 src/trg-remote-prefs-dialog.c:420
+msgid "Port test"
 msgstr ""
 
-#: src/util.c:146
-#, c-format
-msgid "%'.1f MB"
+#: src/trg-remote-prefs-dialog.c:337
+msgid "Testing..."
 msgstr ""
 
-#: src/util.c:149
+#: src/trg-remote-prefs-dialog.c:359 src/trg-remote-prefs-dialog.c:451
 #, c-format
-msgid "%'.1f GB"
+msgid "Blocklist (%ld entries)"
 msgstr ""
 
-#: src/util.c:161
-#, c-format
-msgid "%.1f KB/s"
+#: src/trg-remote-prefs-dialog.c:382
+msgid "Updating..."
 msgstr ""
 
-#: src/util.c:163
-#, c-format
-msgid "%.2f MB/s"
+#: src/trg-remote-prefs-dialog.c:401
+msgid "Required"
 msgstr ""
 
-#: src/util.c:165
-#, c-format
-msgid "%.1f MB/s"
+#: src/trg-remote-prefs-dialog.c:402
+msgid "Preferred"
 msgstr ""
 
-#: src/util.c:167
-#, c-format
-msgid "%.2f GB/s"
+#: src/trg-remote-prefs-dialog.c:403
+msgid "Tolerated"
 msgstr ""
 
-#: src/util.c:201
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/util.c:202
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/util.c:203
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/trg-remote-prefs-dialog.c:412
+msgid "Encryption"
+msgstr ""
 
-#: src/util.c:206
-#, c-format
-msgid "%ld second"
-msgid_plural "%ld seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/trg-remote-prefs-dialog.c:418
+msgid "Peer port"
+msgstr ""
 
-#: src/trg-torrent-graph.c:394
-msgid "Total Uploading"
+#: src/trg-remote-prefs-dialog.c:421
+msgid "Test"
 msgstr ""
 
-#: src/trg-torrent-graph.c:399
-msgid "Total Downloading"
+#: src/trg-remote-prefs-dialog.c:427
+msgid "Random peer port on start"
 msgstr ""
 
-#: src/trg-torrent-move-dialog.c:96
-msgid "Location:"
+#: src/trg-remote-prefs-dialog.c:433
+msgid "Peer port forwarding"
 msgstr ""
 
-#: src/trg-torrent-move-dialog.c:154
-#, c-format
-msgid "Move %s"
+#: src/trg-remote-prefs-dialog.c:440
+msgid "Peer exchange (PEX)"
 msgstr ""
 
-#: src/trg-torrent-move-dialog.c:157
-#, c-format
-msgid "Move %d torrents"
+#: src/trg-remote-prefs-dialog.c:446
+msgid "Local peer discovery"
 msgstr ""
 
-#: src/trg-status-bar.c:74
-#, c-format
-msgid "Connected to Transmission %g, getting torrents..."
+#: src/trg-remote-prefs-dialog.c:461
+msgid "Update"
 msgstr ""
 
-#: src/trg-status-bar.c:95
-#, c-format
-msgid ""
-"%d torrents ..  Down %s, Up %s  ..  %d seeding, %d downloading, %d paused"
+#: src/trg-remote-prefs-dialog.c:477
+msgid "Blocklist URL:"
 msgstr ""
 
-#: src/trg-stats-dialog.c:267
-msgid "Statistics"
+#: src/trg-remote-prefs-dialog.c:498
+msgid "Download directory"
 msgstr ""
 
-#: src/trg-stats-dialog.c:286
-msgid "Download Total"
+#: src/trg-remote-prefs-dialog.c:501
+msgid "Incomplete download dir"
 msgstr ""
 
-#: src/trg-stats-dialog.c:287
-msgid "Upload Total"
+#: src/trg-remote-prefs-dialog.c:517
+msgid "Torrent done script"
 msgstr ""
 
-#: src/trg-stats-dialog.c:289
-msgid "Files Added"
+#: src/trg-remote-prefs-dialog.c:538
+msgid "Cache size (MB)"
 msgstr ""
 
-#: src/trg-stats-dialog.c:291
-msgid "Session Count"
+#: src/trg-remote-prefs-dialog.c:543
+msgid "Rename partial files"
 msgstr ""
 
-#: src/trg-stats-dialog.c:293
-msgid "Time Active"
+#: src/trg-remote-prefs-dialog.c:551
+msgid "Trash original torrent files"
 msgstr ""
 
-#: src/trg-stats-dialog.c:298
-msgid "Statistic"
+#: src/trg-remote-prefs-dialog.c:558
+msgid "Start added torrents"
 msgstr ""
 
-#: src/trg-stats-dialog.c:300
-msgid "Session"
+#: src/trg-remote-prefs-dialog.c:584 src/trg-toolbar.c:261
+msgid "Remote Preferences"
 msgstr ""
 
-#: src/trg-stats-dialog.c:302
-msgid "Cumulative"
+#: src/trg-remote-prefs-dialog.c:617
+msgid "Connections"
 msgstr ""
 
-#: src/trg-general-panel.c:169
-msgid "N/A"
+#: src/trg-remote-prefs-dialog.c:622 src/trg-torrent-props-dialog.c:316
+msgid "Limits"
 msgstr ""
 
-#: src/trg-general-panel.c:218
-msgid "Completed"
+#: src/trg-state-selector.c:131
+msgid "All"
 msgstr ""
 
-#: src/trg-general-panel.c:221
-msgid "Seeders"
+#: src/trg-state-selector.c:134
+msgid "Downloading"
 msgstr ""
 
-#: src/trg-general-panel.c:223
-msgid "Rate Down"
+#: src/trg-state-selector.c:137
+msgid "Paused"
 msgstr ""
 
-#: src/trg-general-panel.c:230
-msgid "Rate Up"
+#: src/trg-state-selector.c:139
+msgid "Checking"
 msgstr ""
 
-#: src/trg-general-panel.c:240
-msgid "Location"
+#: src/trg-state-selector.c:141
+msgid "Complete"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:177
-msgid "Honor global limits"
+#: src/trg-state-selector.c:143
+msgid "Incomplete"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:184 src/trg-cell-renderer-priority.c:72
-msgid "Low"
+#: src/trg-stats-dialog.c:267
+msgid "Statistics"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:185 src/trg-cell-renderer-priority.c:76
-msgid "Normal"
+#: src/trg-stats-dialog.c:286
+msgid "Download Total"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:186 src/trg-cell-renderer-priority.c:74
-msgid "High"
+#: src/trg-stats-dialog.c:288
+msgid "Upload Total"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:189
-msgid "Torrent priority:"
+#: src/trg-stats-dialog.c:290
+msgid "Files Added"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:192
-msgid "Limit download speed (Kbps)"
+#: src/trg-stats-dialog.c:292
+msgid "Session Count"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:205
-msgid "Limit upload speed (Kbps)"
+#: src/trg-stats-dialog.c:294
+msgid "Time Active"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
-msgid "Use global settings"
+#: src/trg-stats-dialog.c:299
+msgid "Statistic"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:222
-msgid "Stop seeding at ratio"
+#: src/trg-stats-dialog.c:301
+msgid "Session"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:224
-msgid "Seed regardless of ratio"
+#: src/trg-stats-dialog.c:304
+msgid "Cumulative"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:227
-msgid "Seed ratio mode:"
+#: src/trg-status-bar.c:74
+#, c-format
+msgid "Connected to Transmission %g, getting torrents..."
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:235
-msgid "Seed ratio limit:"
+#: src/trg-status-bar.c:96
+#, c-format
+msgid ""
+"%d torrents ..  Down %s, Up %s  ..  %d seeding, %d downloading, %d paused"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
-msgid "Peer limit:"
+#: src/trg-toolbar.c:246
+msgid "Remove with data"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:279
-#, c-format
-msgid "Multiple (%d) torrent properties"
+#: src/trg-torrent-add-url-dialog.c:89
+msgid "Start Paused"
 msgstr ""
 
-#: src/trg-trackers-tree-view.c:152
-msgid "Tier"
+#: src/trg-torrent-add-url-dialog.c:92
+msgid "Add torrent from URL"
 msgstr ""
 
-#: src/trg-trackers-tree-view.c:165
-msgid "Announce URL"
+#: src/trg-torrent-graph.c:398
+msgid "Total Uploading"
 msgstr ""
 
-#: src/trg-trackers-tree-view.c:175
-msgid "Scrape URL"
+#: src/trg-torrent-graph.c:406
+msgid "Total Downloading"
 msgstr ""
 
-#: src/trg-trackers-tree-view.c:272
-msgid "Delete"
+#: src/trg-torrent-move-dialog.c:96
+msgid "Location:"
 msgstr ""
 
-#: src/trg-toolbar.c:245
-msgid "Remove with data"
+#: src/trg-torrent-move-dialog.c:154
+#, c-format
+msgid "Move %s"
 msgstr ""
 
-#: src/trg-cell-renderer-wanted.c:67
-msgid "Yes"
+#: src/trg-torrent-move-dialog.c:157
+#, c-format
+msgid "Move %d torrents"
 msgstr ""
 
-#: src/trg-cell-renderer-wanted.c:69
-msgid "No"
+#: src/trg-torrent-props-dialog.c:179
+msgid "Honor global limits"
 msgstr ""
 
-#: src/trg-files-tree-view.c:253
-msgid "High Priority"
+#: src/trg-torrent-props-dialog.c:186
+msgid "Low"
 msgstr ""
 
-#: src/trg-files-tree-view.c:257
-msgid "Normal Priority"
+#: src/trg-torrent-props-dialog.c:187
+msgid "Normal"
 msgstr ""
 
-#: src/trg-files-tree-view.c:262
-msgid "Low Priority"
+#: src/trg-torrent-props-dialog.c:188
+msgid "High"
 msgstr ""
 
-#: src/trg-files-tree-view.c:273
-msgid "Download"
+#: src/trg-torrent-props-dialog.c:191
+msgid "Torrent priority:"
 msgstr ""
 
-#: src/trg-files-tree-view.c:282
-msgid "Skip"
+#: src/trg-torrent-props-dialog.c:194
+msgid "Limit download speed (Kbps)"
 msgstr ""
 
-#: src/trg-files-tree-view.c:369
-msgid "Wanted"
+#: src/trg-torrent-props-dialog.c:207
+msgid "Limit upload speed (Kbps)"
 msgstr ""
 
-#: src/trg-files-tree-view.c:371
-msgid "Priority"
+#: src/trg-torrent-props-dialog.c:223
+msgid "Use global settings"
 msgstr ""
 
-#: src/trg-about-window.c:59
-msgid "A remote client to transmission-daemon."
+#: src/trg-torrent-props-dialog.c:225
+msgid "Stop seeding at ratio"
 msgstr ""
 
-#: src/trg-menu-bar.c:208
-msgid "_View"
+#: src/trg-torrent-props-dialog.c:227
+msgid "Seed regardless of ratio"
 msgstr ""
 
-#: src/trg-menu-bar.c:213
-msgid "State selector"
+#: src/trg-torrent-props-dialog.c:230
+msgid "Seed ratio mode:"
 msgstr ""
 
-#: src/trg-menu-bar.c:218
-msgid "Torrent _details"
+#: src/trg-torrent-props-dialog.c:238
+msgid "Seed ratio limit:"
 msgstr ""
 
-#: src/trg-menu-bar.c:222
-msgid "_Statistics"
+#: src/trg-torrent-props-dialog.c:249
+msgid "Peer limit:"
 msgstr ""
 
-#: src/trg-menu-bar.c:236
-msgid "_Options"
+#: src/trg-torrent-props-dialog.c:282
+#, c-format
+msgid "Multiple (%d) torrent properties"
 msgstr ""
 
-#: src/trg-menu-bar.c:242
-msgid "_Local Preferences"
+#: src/trg-torrent-tree-view.c:44
+msgid "Done"
 msgstr ""
 
-#: src/trg-menu-bar.c:247
-msgid "_Remote Preferences"
+#: src/trg-torrent-tree-view.c:48
+msgid "Seeds"
 msgstr ""
 
-#: src/trg-menu-bar.c:256
-msgid "_File"
+#: src/trg-trackers-tree-view.c:152
+msgid "Tier"
 msgstr ""
 
-#: src/trg-menu-bar.c:261
-msgid "_Connect"
+#: src/trg-trackers-tree-view.c:165
+msgid "Announce URL"
 msgstr ""
 
-#: src/trg-menu-bar.c:264
-msgid "_Disconnect"
+#: src/trg-trackers-tree-view.c:175
+msgid "Scrape URL"
 msgstr ""
 
-#: src/trg-menu-bar.c:267
-msgid "_Add"
+#: src/trg-trackers-tree-view.c:272
+msgid "Delete"
 msgstr ""
 
-#: src/trg-menu-bar.c:270
-msgid "Add from _URL"
+#: src/util.c:55
+msgid "JSON decoding error."
 msgstr ""
 
-#: src/trg-menu-bar.c:274
-msgid "_Quit"
+#: src/util.c:60
+msgid "Server responded, but with no result."
 msgstr ""
 
-#: src/trg-menu-bar.c:283
-msgid "_Torrent"
+#: src/util.c:64
+#, c-format
+msgid "Request failed with HTTP code %d"
 msgstr ""
 
-#: src/trg-menu-bar.c:291
-msgid "_Resume"
+#: src/util.c:127
+msgid "None"
 msgstr ""
 
-#: src/trg-menu-bar.c:294
-msgid "_Pause"
+#: src/util.c:137
+#, c-format
+msgid "%'u byte"
+msgid_plural "%'u bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:143
+#, c-format
+msgid "%'.1f KB"
 msgstr ""
 
-#: src/trg-menu-bar.c:297
-msgid "_Verify"
+#: src/util.c:146
+#, c-format
+msgid "%'.1f MB"
 msgstr ""
 
-#: src/trg-menu-bar.c:300
-msgid "Re-_announce"
+#: src/util.c:149
+#, c-format
+msgid "%'.1f GB"
 msgstr ""
 
-#: src/trg-menu-bar.c:303
-msgid "_Move"
+#: src/util.c:161
+#, c-format
+msgid "%.1f KB/s"
 msgstr ""
 
-#: src/trg-menu-bar.c:310
-msgid "Remove and Delete"
+#: src/util.c:163
+#, c-format
+msgid "%.2f MB/s"
 msgstr ""
 
-#: src/trg-menu-bar.c:321
-msgid "_Help"
+#: src/util.c:165
+#, c-format
+msgid "%.1f MB/s"
 msgstr ""
 
-#: src/trg-menu-bar.c:327
-msgid "_About"
+#: src/util.c:167
+#, c-format
+msgid "%.2f GB/s"
 msgstr ""
+
+#: src/util.c:201
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:202
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:204
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:207
+#, c-format
+msgid "%ld second"
+msgid_plural "%ld seconds"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/src/Makefile.am b/src/Makefile.am
index 48550a6..4527e0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = transmission-remote-gtk.schemas
 
 bin_PROGRAMS = transmission-remote-gtk
-CFLAGS = --pedantic -Wall -I.. -O2 -DTRGLOCALEDIR=\""$(trglocaledir)"\" $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gconf_CFLAGS) $(gio_CFLAGS) $(unique_CFLAGS) $(notify_CFLAGS)
+INCLUDES = --pedantic -Wall -I.. -O2 -DTRGLOCALEDIR=\""$(trglocaledir)"\" $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gconf_CFLAGS) $(gio_CFLAGS) $(unique_CFLAGS) $(notify_CFLAGS)
 
 transmission_remote_gtk_SOURCES = main.c \
 	  requests.c \
diff --git a/src/torrent.h b/src/torrent.h
index e76fccc..16102e4 100644
--- a/src/torrent.h
+++ b/src/torrent.h
@@ -30,6 +30,7 @@
 #define TORRENT_FLAG_WAITING_CHECK     (1 << 5) /* 0x16 */
 #define TORRENT_FLAG_DOWNLOADING       (1 << 6) /* 0x32 */
 #define TORRENT_FLAG_PAUSED            (1 << 7) /* 0x64 */
+#define FILTER_FLAG_TRACKER            (1 << 8) /* 0x128 */
 
 gint64 torrent_get_size(JsonObject * t);
 const gchar *torrent_get_name(JsonObject * t);
diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c
index c0165fd..bed2815 100644
--- a/src/trg-general-panel.c
+++ b/src/trg-general-panel.c
@@ -27,12 +27,15 @@
 #include "trg-general-panel.h"
 #include "trg-torrent-model.h"
 
+#define TRG_GENERAL_PANEL_COLUMNS 3
+#define TRG_GENERAL_PANEL_COLUMNS_TOTAL 6
+
 static void gtk_label_clear(GtkLabel * l);
 static GtkLabel *gen_panel_label_get_key_label(GtkLabel * l);
-static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * fixed,
-                                             char *key, int col, int row);
+static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * gp,
+                                             char *key, guint col, guint row);
 
-G_DEFINE_TYPE(TrgGeneralPanel, trg_general_panel, GTK_TYPE_FIXED)
+G_DEFINE_TYPE(TrgGeneralPanel, trg_general_panel, GTK_TYPE_TABLE)
 #define TRG_GENERAL_PANEL_GET_PRIVATE(o) \
   (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_GENERAL_PANEL, TrgGeneralPanelPrivate))
 typedef struct _TrgGeneralPanelPrivate TrgGeneralPanelPrivate;
@@ -179,36 +182,51 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
     gtk_label_set_text(GTK_LABEL(priv->gen_leechers_label), buf);
 }
 
-static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * fixed,
-                                             char *key, int col, int row)
+static GtkLabel *trg_general_panel_add_label_with_width(TrgGeneralPanel *gp,
+                                             char *key, guint col, guint row, gint width)
 {
     GtkWidget *keyLabel;
     GtkWidget *value;
+    GtkWidget *alignment;
     gchar *keyMarkup;
+    int startCol = (col == 0) ? 0 : col*2;
 
+    alignment = gtk_alignment_new(0, 0, 0, 0);
     keyLabel = gtk_label_new(NULL);
     keyMarkup =
         g_markup_printf_escaped(strlen(key) > 0 ? "<b>%s:</b>" : "", key);
     gtk_label_set_markup(GTK_LABEL(keyLabel), keyMarkup);
     g_free(keyMarkup);
-    gtk_fixed_put(GTK_FIXED(fixed), keyLabel, 10 + (col * 280),
-                  10 + (row * 22));
+    gtk_container_add(GTK_CONTAINER(alignment), keyLabel);
+    gtk_table_attach(GTK_TABLE(gp), alignment, startCol, startCol+1, row, row+1, GTK_FILL, 0, 2, 2);
 
+    alignment = gtk_alignment_new(0, 0, 0, 0);
     value = gtk_label_new(NULL);
-    gtk_label_set_selectable(GTK_LABEL(value), TRUE);
-    gtk_fixed_put(GTK_FIXED(fixed), value, 120 + (col * 300),
-                  10 + (row * 22));
     g_object_set_data(G_OBJECT(value), "key-label", keyLabel);
+    gtk_label_set_selectable(GTK_LABEL(value), TRUE);
+    gtk_container_add(GTK_CONTAINER(alignment), value);
+    gtk_table_attach(GTK_TABLE(gp), alignment, startCol+1, width < 0 ? TRG_GENERAL_PANEL_COLUMNS_TOTAL-1 : startCol+1+width, row, row+1, GTK_FILL | GTK_SHRINK, 0, 2, 2);
 
     return GTK_LABEL(value);
 }
 
+static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel *gp,
+                                             char *key, guint col, guint row)
+{
+    return trg_general_panel_add_label_with_width(gp, key, col, row, 1);
+}
+
 static void trg_general_panel_init(TrgGeneralPanel * self)
 {
     TrgGeneralPanelPrivate *priv = TRG_GENERAL_PANEL_GET_PRIVATE(self);
+    int i;
+
+    g_object_set(G_OBJECT(self), "n-columns", TRG_GENERAL_PANEL_COLUMNS_TOTAL,
+            "n-rows", 7,
+            NULL);
 
     priv->gen_name_label =
-        trg_general_panel_add_label(self, _("Name"), 0, 0);
+        trg_general_panel_add_label_with_width(self, _("Name"), 0, 0, -1);
 
     priv->gen_size_label =
         trg_general_panel_add_label(self, _("Size"), 0, 1);
@@ -241,6 +259,9 @@ static void trg_general_panel_init(TrgGeneralPanel * self)
 
     priv->gen_error_label = trg_general_panel_add_label(self, "", 0, 6);
 
+    for (i = 0; i < TRG_GENERAL_PANEL_COLUMNS_TOTAL; i++)
+        gtk_table_set_col_spacing(GTK_TABLE(self), i, i % 2 == 0 ? 20 : 40);
+
     gtk_widget_set_sensitive(GTK_WIDGET(self), FALSE);
 }
 
diff --git a/src/trg-general-panel.h b/src/trg-general-panel.h
index ef20ffd..0f49088 100644
--- a/src/trg-general-panel.h
+++ b/src/trg-general-panel.h
@@ -40,11 +40,11 @@ G_BEGIN_DECLS
 #define TRG_GENERAL_PANEL_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_GENERAL_PANEL, TrgGeneralPanelClass))
     typedef struct {
-    GtkFixed parent;
+    GtkTable parent;
 } TrgGeneralPanel;
 
 typedef struct {
-    GtkFixedClass parent_class;
+    GtkTableClass parent_class;
 } TrgGeneralPanelClass;
 
 GType trg_general_panel_get_type(void);
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 8efe06c..4610b87 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -796,7 +796,7 @@ GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win)
     gboolean show_graph;
     GError *error = NULL;
 
-    gtk_widget_set_size_request(notebook, -1, 190);
+    gtk_widget_set_size_request(notebook, -1, 175);
 
     priv->genDetails = trg_general_panel_new(priv->sortedTorrentModel);
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
@@ -1052,7 +1052,7 @@ trg_torrent_tree_view_visible_func(GtkTreeModel * model,
             gchar *filterTextFolded = g_utf8_casefold(filterText, -1);
             gchar *nameFolded = g_utf8_casefold(name, -1);
 
-            if (!strstr(nameFolded, filterTextFolded))
+            if (strstr(nameFolded, filterTextFolded))
                 visible = FALSE;
 
             g_free(filterTextFolded);