Merge branch 'master' into new-aday-design

Conflicts:
	src/yelp-window.c

10 files changed, 382 insertions, 340 deletions

diff --git a/NEWS b/NEWS
index 6d80a3fb..0914edf5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+3.12.0
+======
+* Stable release. No changes since 3.11.91
+
+3.11.91
+=======
+* Fixed critical crasher after closing windows
+* Fixed some deprecation warnings
+* Updated translations:
+  de    (Benjamin Steinwender)
+  gd    (GunChleoc)
+  kn    (Shankar Prasad)
+  lt    (Aurimas Černius)
+  ml    (Piotr Drąg)
+  pt_BR (Rafael Ferreira)
+  zh_CN (Tong Hui)
+
 3.11.1
 ======
 * Implemented auto-reload for DocBook, #704821
diff --git a/configure.ac b/configure.ac
index 787f47b0..67f5e12d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([Yelp],[3.11.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
+AC_INIT([Yelp],[3.12.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
 
 AC_CONFIG_SRCDIR([src/yelp.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/libyelp/yelp-location-entry.c b/libyelp/yelp-location-entry.c
index cb41c265..5b970a01 100644
--- a/libyelp/yelp-location-entry.c
+++ b/libyelp/yelp-location-entry.c
@@ -520,16 +520,16 @@ location_entry_dispose (GObject *object)
         priv->view = NULL;
     }
 
+    if (priv->bookmarks_changed) {
+        g_signal_handler_disconnect (priv->bookmarks, priv->bookmarks_changed);
+        priv->bookmarks_changed = 0;
+    }
+
     if (priv->bookmarks) {
         g_object_unref (priv->bookmarks);
         priv->bookmarks = NULL;
     }
 
-    if (priv->bookmarks_changed) {
-        g_source_remove (priv->bookmarks_changed);
-        priv->bookmarks_changed = 0;
-    }
-
     if (priv->row) {
         gtk_tree_row_reference_free (priv->row);
         priv->row = NULL;
diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index 745ef54c..e3e11d39 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -26,7 +26,9 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#endif
 #include <webkit/webkit.h>
 
 #include "yelp-debug.h"
@@ -309,12 +311,12 @@ yelp_view_dispose (GObject *object)
     view_clear_load (YELP_VIEW (object));
 
     if (priv->vadjuster > 0) {
-        g_source_remove (priv->vadjuster);
+        g_signal_handler_disconnect (priv->vadjustment, priv->vadjuster);
         priv->vadjuster = 0;
     }
 
     if (priv->hadjuster > 0) {
-        g_source_remove (priv->hadjuster);
+        g_signal_handler_disconnect (priv->hadjustment, priv->hadjuster);
         priv->hadjuster = 0;
     }
 
@@ -809,8 +811,10 @@ view_install_uri (YelpView    *view,
     gtkwin = gtk_widget_get_toplevel (GTK_WIDGET (view));
     if (gtkwin != NULL && gtk_widget_is_toplevel (gtkwin)) {
         gdkwin = gtk_widget_get_window (gtkwin);
-        if (gdkwin != NULL)
+#ifdef GDK_WINDOWING_X11
+        if (gdkwin != NULL && GDK_IS_X11_WINDOW (gdkwin))
             xid = gdk_x11_window_get_xid (gdkwin);
+#endif
     }
 
     if (priv->state == YELP_VIEW_STATE_ERROR)
@@ -907,7 +911,7 @@ view_set_hadjustment (YelpView      *view,
     YelpViewPrivate *priv = GET_PRIV (view);
     priv->hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (view));
     if (priv->hadjuster > 0)
-        g_source_remove (priv->hadjuster);
+        g_signal_handler_disconnect (priv->hadjustment, priv->hadjuster);
     priv->hadjuster = 0;
     if (priv->hadjustment)
         priv->hadjuster = g_signal_connect (priv->hadjustment, "value-changed",
@@ -922,7 +926,7 @@ view_set_vadjustment (YelpView      *view,
     YelpViewPrivate *priv = GET_PRIV (view);
     priv->vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (view));
     if (priv->vadjuster > 0)
-        g_source_remove (priv->vadjuster);
+        g_signal_handler_disconnect (priv->vadjustment, priv->vadjuster);
     priv->vadjuster = 0;
     if (priv->vadjustment)
         priv->vadjuster = g_signal_connect (priv->vadjustment, "value-changed",
diff --git a/po/id.po b/po/id.po
index a8b0cb23..77bf7fbd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,26 +2,26 @@
 # Copyright (C) 2004 THE yelp's COPYRIGHT HOLDER
 # This file is distributed under the same license as the yelp package.
 #
+#
 # Mohammad DAMT <mdamt@bisnisweb.com>, 2004.
 # Ahmad Riza H Nst <ari@160c.afraid.org>, 2005.
-# Dirgita <dirgitadevina@yahoo.co.id>, 2010, 2011.
-# Andika Triwidada <andika@gmail.com>, 2011, 2012, 2013.
-#
+# Dirgita <dirgitadevina@yahoo.co.id>, 2010, 2011, 2014.
+# Andika Triwidada <andika@gmail.com>, 2011, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: yelp master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=yelp&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2013-03-31 11:26+0000\n"
-"PO-Revision-Date: 2013-03-31 19:16+0700\n"
-"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
-"Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
+"POT-Creation-Date: 2014-04-05 11:37+0000\n"
+"PO-Revision-Date: 2014-04-09 05:31+0700\n"
+"Last-Translator: Dirgita <dirgitadevina@yahoo.co.id>\n"
+"Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id_ID\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. (itstool) path: msg/msgstr
 #. ID: install.tooltip
@@ -37,36 +37,36 @@ msgstr ""
 msgid "Install <string/>"
 msgstr "Pasang <string/>"
 
-#: ../libyelp/yelp-bz2-decompressor.c:146
-#: ../libyelp/yelp-lzma-decompressor.c:155
+#: ../libyelp/yelp-bz2-decompressor.c:144
+#: ../libyelp/yelp-lzma-decompressor.c:153
 msgid "Invalid compressed data"
 msgstr "Data terkompresi tak valid"
 
-#: ../libyelp/yelp-bz2-decompressor.c:152
-#: ../libyelp/yelp-lzma-decompressor.c:161
+#: ../libyelp/yelp-bz2-decompressor.c:150
+#: ../libyelp/yelp-lzma-decompressor.c:159
 msgid "Not enough memory"
-msgstr "Tidak cukup memori"
+msgstr "Tak cukup memori"
 
-#: ../libyelp/yelp-docbook-document.c:282 ../libyelp/yelp-info-document.c:238
-#: ../libyelp/yelp-mallard-document.c:306
-#: ../libyelp/yelp-mallard-document.c:457 ../libyelp/yelp-man-document.c:282
+#: ../libyelp/yelp-docbook-document.c:297 ../libyelp/yelp-info-document.c:237
+#: ../libyelp/yelp-mallard-document.c:305
+#: ../libyelp/yelp-mallard-document.c:456 ../libyelp/yelp-man-document.c:281
 #, c-format
 msgid "The page ‘%s’ was not found in the document ‘%s’."
 msgstr "Halaman '%s' tak ditemukan di dokumen '%s'."
 
-#: ../libyelp/yelp-docbook-document.c:317 ../libyelp/yelp-info-document.c:372
-#: ../libyelp/yelp-man-document.c:417
+#: ../libyelp/yelp-docbook-document.c:332 ../libyelp/yelp-info-document.c:371
+#: ../libyelp/yelp-man-document.c:416
 #, c-format
 msgid "The file does not exist."
 msgstr "Berkas tidak ada."
 
-#: ../libyelp/yelp-docbook-document.c:327 ../libyelp/yelp-info-document.c:382
-#: ../libyelp/yelp-man-document.c:427
+#: ../libyelp/yelp-docbook-document.c:342 ../libyelp/yelp-info-document.c:381
+#: ../libyelp/yelp-man-document.c:426
 #, c-format
 msgid "The file ‘%s’ does not exist."
 msgstr "Berkas '%s' tidak ada."
 
-#: ../libyelp/yelp-docbook-document.c:342
+#: ../libyelp/yelp-docbook-document.c:357
 #, c-format
 msgid ""
 "The file ‘%s’ could not be parsed because it is not a well-formed XML "
@@ -75,7 +75,7 @@ msgstr ""
 "Berkas ‘%s’ tidak dapat diuraikan karena bukan dokumen XML yang baik "
 "bentuknya."
 
-#: ../libyelp/yelp-docbook-document.c:355
+#: ../libyelp/yelp-docbook-document.c:370
 #, c-format
 msgid ""
 "The file ‘%s’ could not be parsed because one or more of its included files "
@@ -84,57 +84,57 @@ msgstr ""
 "Berkas ‘%s’ tidak dapat diuraikan karena satu atau lebih berkas terkait "
 "bukan dokumen XLM yang baik bentuknya."
 
-#: ../libyelp/yelp-docbook-document.c:765
+#: ../libyelp/yelp-docbook-document.c:803
 msgid "Unknown"
 msgstr "Tak dikenal"
 
-#: ../libyelp/yelp-docbook-document.c:826 ../libyelp/yelp-info-document.c:315
-#: ../libyelp/yelp-man-document.c:359
+#: ../libyelp/yelp-docbook-document.c:864 ../libyelp/yelp-info-document.c:314
+#: ../libyelp/yelp-man-document.c:358
 #, c-format
 msgid "The requested page was not found in the document ‘%s’."
 msgstr "Halaman yang diminta tak ditemukan di dokumen '%s'."
 
 # Dirgita: "Telah Diindeks" atau "Telah diindeks"?
-#: ../libyelp/yelp-document.c:268
+#: ../libyelp/yelp-document.c:266
 msgid "Indexed"
 msgstr "Telah diindeks"
 
-#: ../libyelp/yelp-document.c:269
+#: ../libyelp/yelp-document.c:267
 msgid "Whether the document content has been indexed"
 msgstr "Menentukan isi dokumen telah diindeks atau belum"
 
-#: ../libyelp/yelp-document.c:277
+#: ../libyelp/yelp-document.c:275
 msgid "Document URI"
 msgstr "URI Dokumen"
 
-#: ../libyelp/yelp-document.c:278
+#: ../libyelp/yelp-document.c:276
 msgid "The URI which identifies the document"
 msgstr "URI milik dokumen"
 
-#: ../libyelp/yelp-document.c:994
+#: ../libyelp/yelp-document.c:992
 #, c-format
 msgid "Search results for “%s”"
 msgstr "Hasil pencarian \"%s\""
 
-#: ../libyelp/yelp-document.c:1006
+#: ../libyelp/yelp-document.c:1004
 #, c-format
 msgid "No matching help pages found in “%s”."
-msgstr "Tidak ada halaman bantuan pada “%s”."
+msgstr "Tak ada halaman bantuan pada “%s”."
 
-#: ../libyelp/yelp-document.c:1012
+#: ../libyelp/yelp-document.c:1010
 msgid "No matching help pages found."
-msgstr "Tidak ada halaman bantuan."
+msgstr "Tak ada halaman bantuan."
 
-#: ../libyelp/yelp-error.c:37
+#: ../libyelp/yelp-error.c:35
 #, c-format
 msgid "An unknown error occurred."
 msgstr "Terjadi galat yang tak dikenal."
 
-#: ../libyelp/yelp-help-list.c:549 ../libyelp/yelp-help-list.c:558
+#: ../libyelp/yelp-help-list.c:548 ../libyelp/yelp-help-list.c:557
 msgid "All Help Documents"
 msgstr "Semua Dokumen Bantuan"
 
-#: ../libyelp/yelp-info-document.c:397
+#: ../libyelp/yelp-info-document.c:396
 #, c-format
 msgid ""
 "The file ‘%s’ could not be parsed because it is not a well-formed info page."
@@ -142,418 +142,418 @@ msgstr ""
 "Berkas ‘%s’ tidak dapat diuraikan karena bukan halaman info yang baik "
 "bentuknya."
 
-#: ../libyelp/yelp-location-entry.c:336
+#: ../libyelp/yelp-location-entry.c:334
 msgid "View"
 msgstr "Tampilan"
 
-#: ../libyelp/yelp-location-entry.c:337
+#: ../libyelp/yelp-location-entry.c:335
 msgid "A YelpView instance to control"
 msgstr "Instansi YelpView yang ingin dikendalikan"
 
-#: ../libyelp/yelp-location-entry.c:352
+#: ../libyelp/yelp-location-entry.c:350
 msgid "Bookmarks"
 msgstr "Penanda"
 
-#: ../libyelp/yelp-location-entry.c:353
+#: ../libyelp/yelp-location-entry.c:351
 msgid "A YelpBookmarks implementation instance"
 msgstr "Suatu instansi implementasi YelpBookmarks"
 
-#: ../libyelp/yelp-location-entry.c:369
+#: ../libyelp/yelp-location-entry.c:367
 msgid "Enable Search"
 msgstr "Aktifkan Pencarian"
 
-#: ../libyelp/yelp-location-entry.c:370
+#: ../libyelp/yelp-location-entry.c:368
 msgid "Whether the location entry can be used as a search field"
 msgstr "Apakah entri lokasi dapat dipakai sebagai ruas pencarian"
 
-#: ../libyelp/yelp-location-entry.c:440 ../src/yelp-window.c:270
+#: ../libyelp/yelp-location-entry.c:438 ../src/yelp-window.c:268
 msgid "Search..."
 msgstr "Cari..."
 
-#: ../libyelp/yelp-location-entry.c:783
+#: ../libyelp/yelp-location-entry.c:781
 msgid "Clear the search text"
 msgstr "Membersihkan teks pencarian"
 
-#: ../libyelp/yelp-location-entry.c:831 ../libyelp/yelp-location-entry.c:1593
+#: ../libyelp/yelp-location-entry.c:829 ../libyelp/yelp-location-entry.c:1591
 msgid "Bookmark this page"
 msgstr "Menandai halaman ini"
 
-#: ../libyelp/yelp-location-entry.c:839 ../libyelp/yelp-location-entry.c:1601
+#: ../libyelp/yelp-location-entry.c:837 ../libyelp/yelp-location-entry.c:1599
 msgid "Remove bookmark"
 msgstr "Menghapus penanda"
 
-#: ../libyelp/yelp-location-entry.c:1154
+#: ../libyelp/yelp-location-entry.c:1152
 #, c-format
 msgid "Search for “%s”"
 msgstr "Carian \"%s\""
 
-#: ../libyelp/yelp-location-entry.c:1458
+#: ../libyelp/yelp-location-entry.c:1456
 msgid "Loading"
 msgstr "Sedang memuat"
 
-#: ../libyelp/yelp-mallard-document.c:345
+#: ../libyelp/yelp-mallard-document.c:344
 #, c-format
 msgid "The directory ‘%s’ does not exist."
 msgstr "Direktori '%s' tidak ada."
 
-#: ../libyelp/yelp-settings.c:156
+#: ../libyelp/yelp-settings.c:154
 msgid "GtkSettings"
 msgstr "GtkSettings"
 
-#: ../libyelp/yelp-settings.c:157
+#: ../libyelp/yelp-settings.c:155
 msgid "A GtkSettings object to get settings from"
 msgstr "Objek GtkSettings tempat mendapat tatanan"
 
-#: ../libyelp/yelp-settings.c:165
+#: ../libyelp/yelp-settings.c:163
 msgid "GtkIconTheme"
 msgstr "GtkIconTheme"
 
-#: ../libyelp/yelp-settings.c:166
+#: ../libyelp/yelp-settings.c:164
 msgid "A GtkIconTheme object to get icons from"
 msgstr "Objek GtkIconTheme tempat mendapat tatanan"
 
-#: ../libyelp/yelp-settings.c:174
+#: ../libyelp/yelp-settings.c:172
 msgid "Font Adjustment"
 msgstr "Penyesuaian Fonta"
 
-#: ../libyelp/yelp-settings.c:175
+#: ../libyelp/yelp-settings.c:173
 msgid "A size adjustment to add to font sizes"
 msgstr "Penyesuaian ukuran untuk ditambahkan ke ukuran fonta"
 
-#: ../libyelp/yelp-settings.c:183
+#: ../libyelp/yelp-settings.c:181
 msgid "Show Text Cursor"
 msgstr "Tampilkan Kursor Teks"
 
-#: ../libyelp/yelp-settings.c:184
+#: ../libyelp/yelp-settings.c:182
 msgid "Show the text cursor or caret for accessible navigation"
 msgstr "Tampilkan kursor teks atau caret untuk navigasi yang lebih membantu"
 
-#: ../libyelp/yelp-settings.c:192
+#: ../libyelp/yelp-settings.c:190
 msgid "Editor Mode"
 msgstr "Mode Penyunting"
 
-#: ../libyelp/yelp-settings.c:193
+#: ../libyelp/yelp-settings.c:191
 msgid "Enable features useful to editors"
 msgstr "Aktifkan fitur yang berguna bagi para penyunting"
 
-#: ../libyelp/yelp-sqlite-storage.c:150
+#: ../libyelp/yelp-sqlite-storage.c:147
 msgid "Database filename"
 msgstr "Nama berkas basis data"
 
-#: ../libyelp/yelp-sqlite-storage.c:151
+#: ../libyelp/yelp-sqlite-storage.c:148
 msgid "The filename of the sqlite database"
 msgstr "Nama berkas basis data sqlite"
 
-#: ../libyelp/yelp-transform.c:171
+#: ../libyelp/yelp-transform.c:169
 msgid "XSLT Stylesheet"
 msgstr "Stylesheet XSLT"
 
-#: ../libyelp/yelp-transform.c:172
+#: ../libyelp/yelp-transform.c:170
 msgid "The location of the XSLT stylesheet"
 msgstr "Lokasi dari stylesheet XSLT"
 
-#: ../libyelp/yelp-transform.c:379 ../libyelp/yelp-transform.c:394
+#: ../libyelp/yelp-transform.c:378 ../libyelp/yelp-transform.c:393
 #, c-format
 msgid "The XSLT stylesheet ‘%s’ is either missing or not valid."
 msgstr "Stylesheet XSLT '%s' mungkin hilang atau tak valid."
 
-#: ../libyelp/yelp-transform.c:528
+#: ../libyelp/yelp-transform.c:527
 msgid "No href attribute found on yelp:document\n"
 msgstr "Tak ditemukan atribut href pada yelp:document\n"
 
-#: ../libyelp/yelp-transform.c:543
+#: ../libyelp/yelp-transform.c:542
 msgid "Out of memory"
-msgstr "Tidak cukup memori"
+msgstr "Tak cukup memori"
 
-#: ../libyelp/yelp-view.c:131
+#: ../libyelp/yelp-view.c:129
 msgid "_Print..."
 msgstr "_Cetak"
 
-#: ../libyelp/yelp-view.c:136
+#: ../libyelp/yelp-view.c:134
 msgid "_Back"
 msgstr "Kem_bali"
 
-#: ../libyelp/yelp-view.c:141
+#: ../libyelp/yelp-view.c:139
 msgid "_Forward"
 msgstr "_Maju"
 
-#: ../libyelp/yelp-view.c:146
+#: ../libyelp/yelp-view.c:144
 msgid "_Previous Page"
 msgstr "_Halaman Sebelumnya"
 
-#: ../libyelp/yelp-view.c:151
+#: ../libyelp/yelp-view.c:149
 msgid "_Next Page"
 msgstr "Halama_n Selanjutnya"
 
-#: ../libyelp/yelp-view.c:423
+#: ../libyelp/yelp-view.c:421
 msgid "Yelp URI"
 msgstr "URI Yelp"
 
-#: ../libyelp/yelp-view.c:424
+#: ../libyelp/yelp-view.c:422
 msgid "A YelpUri with the current location"
 msgstr "YelpURI untuk lokasi kini"
 
-#: ../libyelp/yelp-view.c:432
+#: ../libyelp/yelp-view.c:430
 msgid "Loading State"
 msgstr "Memuat Keadaan"
 
-#: ../libyelp/yelp-view.c:433
+#: ../libyelp/yelp-view.c:431
 msgid "The loading state of the view"
 msgstr "Sedang memuat keadaan tilikan"
 
-#: ../libyelp/yelp-view.c:442
+#: ../libyelp/yelp-view.c:440
 msgid "Page ID"
 msgstr "ID Halaman"
 
-#: ../libyelp/yelp-view.c:443
+#: ../libyelp/yelp-view.c:441
 msgid "The ID of the root page of the page being viewed"
 msgstr "ID dari halaman akar dari halaman yang sedang ditilik"
 
-#: ../libyelp/yelp-view.c:451
+#: ../libyelp/yelp-view.c:449
 msgid "Root Title"
 msgstr "Judul Akar"
 
-#: ../libyelp/yelp-view.c:452
+#: ../libyelp/yelp-view.c:450
 msgid "The title of the root page of the page being viewed"
 msgstr "Judul dari halaman akar dari halaman yang sedang ditilik"
 
-#: ../libyelp/yelp-view.c:460
+#: ../libyelp/yelp-view.c:458
 msgid "Page Title"
 msgstr "Judul Halaman"
 
-#: ../libyelp/yelp-view.c:461
+#: ../libyelp/yelp-view.c:459
 msgid "The title of the page being viewed"
 msgstr "Judul dari halaman yang sedang ditilik"
 
-#: ../libyelp/yelp-view.c:469
+#: ../libyelp/yelp-view.c:467
 msgid "Page Description"
 msgstr "Keterangan Halaman"
 
-#: ../libyelp/yelp-view.c:470
+#: ../libyelp/yelp-view.c:468
 msgid "The description of the page being viewed"
 msgstr "Keterangan dari halaman yang sedang ditilik"
 
-#: ../libyelp/yelp-view.c:478
+#: ../libyelp/yelp-view.c:476
 msgid "Page Icon"
 msgstr "Ikon Halaman"
 
-#: ../libyelp/yelp-view.c:479
+#: ../libyelp/yelp-view.c:477
 msgid "The icon of the page being viewed"
 msgstr "Ikon dari halaman yang sedang ditilik"
 
-#: ../libyelp/yelp-view.c:720
+#: ../libyelp/yelp-view.c:718
 msgid "You do not have PackageKit. Package install links require PackageKit."
 msgstr ""
 "Anda tidak memiliki PackageKit. Tautan pemasangan paket memerlukan "
 "PackageKit."
 
-#: ../libyelp/yelp-view.c:1014
+#: ../libyelp/yelp-view.c:1012
 msgid "Save Image"
 msgstr "Simpan Gambar"
 
-#: ../libyelp/yelp-view.c:1109
+#: ../libyelp/yelp-view.c:1107
 msgid "Save Code"
 msgstr "Simpan Kode"
 
-#: ../libyelp/yelp-view.c:1272
+#: ../libyelp/yelp-view.c:1270
 #, c-format
 msgid "Send email to %s"
 msgstr "Kirim surel ke %s"
 
-#: ../libyelp/yelp-view.c:1287
+#: ../libyelp/yelp-view.c:1285
 msgid "_Install Packages"
 msgstr "_Pasang Paket"
 
-#: ../libyelp/yelp-view.c:1295
+#: ../libyelp/yelp-view.c:1293
 msgid "_Open Link"
 msgstr "_Buka Taut"
 
-#: ../libyelp/yelp-view.c:1302
+#: ../libyelp/yelp-view.c:1300
 msgid "_Copy Link Location"
 msgstr "_Salin Lokasi Taut"
 
-#: ../libyelp/yelp-view.c:1308
+#: ../libyelp/yelp-view.c:1306
 msgid "Open Link in New _Window"
 msgstr "Buka Taut di _Jendela Baru"
 
-#: ../libyelp/yelp-view.c:1360
+#: ../libyelp/yelp-view.c:1358
 msgid "_Save Image As..."
 msgstr "_Simpan Gambar Sebagai..."
 
-#: ../libyelp/yelp-view.c:1362
+#: ../libyelp/yelp-view.c:1360
 msgid "_Save Video As..."
 msgstr "_Simpan Video Sebagai..."
 
-#: ../libyelp/yelp-view.c:1369
+#: ../libyelp/yelp-view.c:1367
 msgid "S_end Image To..."
 msgstr "Kirim Gambar K_e..."
 
-#: ../libyelp/yelp-view.c:1371
+#: ../libyelp/yelp-view.c:1369
 msgid "S_end Video To..."
 msgstr "Kirim Vid_eo Ke..."
 
-#: ../libyelp/yelp-view.c:1382
+#: ../libyelp/yelp-view.c:1380
 msgid "_Copy Text"
 msgstr "_Salin Teks"
 
-#: ../libyelp/yelp-view.c:1395
+#: ../libyelp/yelp-view.c:1393
 msgid "C_opy Code Block"
 msgstr "Salin Bl_ok Kode"
 
-#: ../libyelp/yelp-view.c:1400
+#: ../libyelp/yelp-view.c:1398
 msgid "Save Code _Block As..."
 msgstr "Simpan _Blok Kode Sebagai..."
 
-#: ../libyelp/yelp-view.c:1507
+#: ../libyelp/yelp-view.c:1505
 #, c-format
 msgid "See all search results for “%s”"
 msgstr "Lihat semua hasil pencarian atas \"%s\""
 
-#: ../libyelp/yelp-view.c:1628
+#: ../libyelp/yelp-view.c:1626
 #, c-format
 msgid "Could not load a document for ‘%s’"
 msgstr "Tak bisa memuat suatu dokumen bagi '%s'"
 
-#: ../libyelp/yelp-view.c:1634
+#: ../libyelp/yelp-view.c:1632
 #, c-format
 msgid "Could not load a document"
 msgstr "Tak bisa memuat suatu dokumen"
 
-#: ../libyelp/yelp-view.c:1709
+#: ../libyelp/yelp-view.c:1707
 msgid "Document Not Found"
 msgstr "Dokumen Tak Ditemukan"
 
-#: ../libyelp/yelp-view.c:1711
+#: ../libyelp/yelp-view.c:1709
 msgid "Page Not Found"
 msgstr "Halaman Tak Ditemukan"
 
-#: ../libyelp/yelp-view.c:1714
+#: ../libyelp/yelp-view.c:1712
 msgid "Cannot Read"
 msgstr "Tak Bisa Membaca"
 
-#: ../libyelp/yelp-view.c:1720
+#: ../libyelp/yelp-view.c:1718
 msgid "Unknown Error"
 msgstr "Galat Tak Dikenal"
 
-#: ../libyelp/yelp-view.c:1740
+#: ../libyelp/yelp-view.c:1738
 msgid "Search for packages containing this document."
 msgstr "Cari paket yang memuat dokumen ini."
 
-#: ../libyelp/yelp-view.c:1892
+#: ../libyelp/yelp-view.c:1890
 #, c-format
 msgid "The URI ‘%s’ does not point to a valid page."
 msgstr "URI '%s' tidak merujuk pada halaman yang sah."
 
-#: ../libyelp/yelp-view.c:1898
+#: ../libyelp/yelp-view.c:1896
 #, c-format
 msgid "The URI does not point to a valid page."
 msgstr "URI tidak merujuk pada halaman yang sah."
 
-#: ../libyelp/yelp-view.c:1904
+#: ../libyelp/yelp-view.c:1902
 #, c-format
 msgid "The URI ‘%s’ could not be parsed."
 msgstr "URI '%s' tidak dapat diuraikan."
 
-#: ../src/yelp-application.c:65
+#: ../src/yelp-application.c:63
 msgid "Turn on editor mode"
 msgstr "Nyalakan mode penyunting"
 
-#: ../src/yelp-application.c:128
+#: ../src/yelp-application.c:126
 msgid "_Larger Text"
 msgstr "Teks Besa_r"
 
-#: ../src/yelp-application.c:130
+#: ../src/yelp-application.c:128
 msgid "Increase the size of the text"
 msgstr "Perbesar ukuran teks"
 
-#: ../src/yelp-application.c:133
+#: ../src/yelp-application.c:131
 msgid "_Smaller Text"
 msgstr "Tek_s Kecil"
 
-#: ../src/yelp-application.c:135
+#: ../src/yelp-application.c:133
 msgid "Decrease the size of the text"
 msgstr "Perkecil ukuran teks"
 
-#: ../src/yelp-application.c:253 ../src/yelp-window.c:1360
+#: ../src/yelp-application.c:251 ../src/yelp-window.c:1358
 #: ../yelp.desktop.in.in.h:1
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/yelp-application.c:288
+#: ../src/yelp-application.c:286
 msgid "Show Text _Cursor"
 msgstr "Tampilkan _Kursor Teks"
 
-#: ../src/yelp-window.c:236
+#: ../src/yelp-window.c:234
 msgid "_Page"
 msgstr "_Halaman"
 
-#: ../src/yelp-window.c:237
+#: ../src/yelp-window.c:235
 msgid "_View"
 msgstr "_Tampilan"
 
-#: ../src/yelp-window.c:238
+#: ../src/yelp-window.c:236
 msgid "_Go"
 msgstr "B_uka"
 
-#: ../src/yelp-window.c:239
+#: ../src/yelp-window.c:237
 msgid "_Bookmarks"
 msgstr "Pem_batas"
 
-#: ../src/yelp-window.c:242
+#: ../src/yelp-window.c:240
 msgid "_New Window"
 msgstr "Je_ndela Baru"
 
-#: ../src/yelp-window.c:247
+#: ../src/yelp-window.c:245
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../src/yelp-window.c:252
+#: ../src/yelp-window.c:250
 msgid "_All Documents"
 msgstr "Semu_a Dokumen"
 
-#: ../src/yelp-window.c:256
+#: ../src/yelp-window.c:254
 msgid "_Add Bookmark"
 msgstr "T_ambah Pembatas"
 
-#: ../src/yelp-window.c:261
+#: ../src/yelp-window.c:259
 msgid "_Remove Bookmark"
 msgstr "_Hapus Pembatas"
 
-#: ../src/yelp-window.c:265
+#: ../src/yelp-window.c:263
 msgid "Find in Page..."
 msgstr "Cari di Halaman..."
 
-#: ../src/yelp-window.c:275
+#: ../src/yelp-window.c:273
 msgid "Open Location"
 msgstr "Buka Lokasi"
 
-#: ../src/yelp-window.c:301
+#: ../src/yelp-window.c:299
 msgid "Application"
 msgstr "Aplikasi"
 
-#: ../src/yelp-window.c:302
+#: ../src/yelp-window.c:300
 msgid "A YelpApplication instance that controls this window"
 msgstr "Instansi YelpApplication yang mengendalikan jendela ini"
 
-#: ../src/yelp-window.c:429
+#: ../src/yelp-window.c:427
 msgid "Read Link _Later"
 msgstr "Baca Taut _Nanti"
 
-#: ../src/yelp-window.c:526
+#: ../src/yelp-window.c:524
 msgid "Find:"
 msgstr "Cari:"
 
-#: ../src/yelp-window.c:548
+#: ../src/yelp-window.c:546
 msgid "Read Later"
 msgstr "Baca Nanti"
 
-#: ../src/yelp-window.c:1180
+#: ../src/yelp-window.c:1178
 #, c-format
 msgid "%i match"
 msgid_plural "%i matches"
 msgstr[0] "%i cocok"
 
-#: ../src/yelp-window.c:1189
+#: ../src/yelp-window.c:1187
 msgid "No matches"
 msgstr "Tak ada yang cocok"
 
@@ -564,3 +564,5 @@ msgstr "Buka bantuan GNOME"
 #: ../yelp.desktop.in.in.h:3
 msgid "documentation;information;manual;"
 msgstr "dokumentasi;informasi;manual;"
+
+
diff --git a/po/ru.po b/po/ru.po
index 991b7f31..d92b7cc1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=yelp&keywords=I18N+L10N&component=General\n"
 "POT-Creation-Date: 2013-04-05 23:43+0000\n"
-"PO-Revision-Date: 2013-04-04 08:56+0600\n"
-"Last-Translator: Dmitriy S. Seregin <dseregin@59.ru>\n"
+"PO-Revision-Date: 2014-04-08 23:47+0400\n"
+"Last-Translator: Yuri Myasoedov <ymyasoedov@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #. (itstool) path: msg/msgstr
 #. ID: install.tooltip
@@ -107,7 +107,7 @@ msgstr "URI документа"
 
 #: ../libyelp/yelp-document.c:278
 msgid "The URI which identifies the document"
-msgstr "URI, определяющий документ"
+msgstr "URI, который идентифицирует документ"
 
 #: ../libyelp/yelp-document.c:994
 #, c-format
@@ -121,7 +121,7 @@ msgstr "В «%s» не найдено совпадающих справочны�
 
 #: ../libyelp/yelp-document.c:1012
 msgid "No matching help pages found."
-msgstr "Не найдно совпадений в справочных страницах."
+msgstr "Не найдено совпадений в справочных страницах."
 
 #: ../libyelp/yelp-error.c:37
 #, c-format
@@ -162,7 +162,7 @@ msgstr "Включить поиск"
 
 #: ../libyelp/yelp-location-entry.c:370
 msgid "Whether the location entry can be used as a search field"
-msgstr "Может ли поле местоположения использоваться для поиска"
+msgstr "Можно ли использовать поле адреса в качестве поля поиска"
 
 #: ../libyelp/yelp-location-entry.c:440 ../src/yelp-window.c:270
 msgid "Search..."
@@ -174,7 +174,7 @@ msgstr "Очистить текст для поиска"
 
 #: ../libyelp/yelp-location-entry.c:831 ../libyelp/yelp-location-entry.c:1593
 msgid "Bookmark this page"
-msgstr "Добавить закладку для этой страницы"
+msgstr "Добавить закладку на эту страницу"
 
 #: ../libyelp/yelp-location-entry.c:839 ../libyelp/yelp-location-entry.c:1601
 msgid "Remove bookmark"
@@ -257,7 +257,7 @@ msgstr "Таблица стилей XSLT «%s» отсутствует или я
 
 #: ../libyelp/yelp-transform.c:528
 msgid "No href attribute found on yelp:document\n"
-msgstr "Отсутстсвует атрибут ссылки в yelp:document\n"
+msgstr "Отсутствует атрибут ссылки в yelp:document\n"
 
 #: ../libyelp/yelp-transform.c:543
 msgid "Out of memory"
@@ -293,7 +293,7 @@ msgstr "YelpUri с текущим местоположением"
 
 #: ../libyelp/yelp-view.c:432
 msgid "Loading State"
-msgstr "Загрузка состояния…"
+msgstr "Загрузка состояния"
 
 #: ../libyelp/yelp-view.c:433
 msgid "The loading state of the view"
@@ -458,7 +458,7 @@ msgstr "Включить режим редактирования"
 
 #: ../src/yelp-application.c:128
 msgid "_Larger Text"
-msgstr "_Увеличить размер текста"
+msgstr "_Увеличить текст"
 
 #: ../src/yelp-application.c:130
 msgid "Increase the size of the text"
@@ -466,7 +466,7 @@ msgstr "Увеличить размер текста"
 
 #: ../src/yelp-application.c:133
 msgid "_Smaller Text"
-msgstr "_Уменьшить размер текста"
+msgstr "_Уменьшить текст"
 
 #: ../src/yelp-application.c:135
 msgid "Decrease the size of the text"
@@ -483,7 +483,7 @@ msgstr "Показывать _курсор"
 
 #: ../src/yelp-window.c:236
 msgid "_Page"
-msgstr "С_траница"
+msgstr "_Страница"
 
 #: ../src/yelp-window.c:237
 msgid "_View"
@@ -491,7 +491,7 @@ msgstr "_Вид"
 
 #: ../src/yelp-window.c:238
 msgid "_Go"
-msgstr "Пере_ход"
+msgstr "_Переход"
 
 #: ../src/yelp-window.c:239
 msgid "_Bookmarks"
@@ -499,7 +499,7 @@ msgstr "_Закладки"
 
 #: ../src/yelp-window.c:242
 msgid "_New Window"
-msgstr "_Создать окно"
+msgstr "_Открыть окно"
 
 #: ../src/yelp-window.c:247
 msgid "_Close"
diff --git a/po/sv.po b/po/sv.po
index e9fe3de5..4d5b2c93 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,191 +1,197 @@
 # Swedish messages for Yelp.
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright © 2001-2012, 2014 Free Software Foundation, Inc.
 # Richard Hult <rhult@codefactory.se>, 2001.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2008, 2009, 2010, 2011, 2012.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: yelp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-26 17:48+0100\n"
-"PO-Revision-Date: 2012-02-26 17:48+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=yelp&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2014-04-18 11:55+0000\n"
+"PO-Revision-Date: 2014-04-29 18:23+0100\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.6.4\n"
 
+#. (itstool) path: msg/msgstr
 #. ID: install.tooltip
 #. This is a format message used to format tooltips on install: links. These
 #. links allow users to install packages by clicking a link in the help. The
 #. tooltip may also be used as the link text, if there's no link text in the
 #. document. Special elements in the message will be replaced with the
 #. appropriate content, as follows:
-#. 
+#.
 #. <string/> - The package to install
-#. 
-#: yelp.xml.in:29(msg/msgstr)
+#.
+#: yelp.xml.in:36
 msgid "Install <string/>"
 msgstr "Installera <string/>"
 
-#: ../libyelp/yelp-bz2-decompressor.c:146
-#: ../libyelp/yelp-lzma-decompressor.c:155
+#: ../libyelp/yelp-bz2-decompressor.c:144
+#: ../libyelp/yelp-lzma-decompressor.c:153
 msgid "Invalid compressed data"
 msgstr "Ogiltigt komprimerat data"
 
-#: ../libyelp/yelp-bz2-decompressor.c:152
-#: ../libyelp/yelp-lzma-decompressor.c:161
+#: ../libyelp/yelp-bz2-decompressor.c:150
+#: ../libyelp/yelp-lzma-decompressor.c:159
 msgid "Not enough memory"
-msgstr "Slut på minne"
+msgstr "Inte tillräckligt med minne"
 
-#: ../libyelp/yelp-docbook-document.c:282
-#: ../libyelp/yelp-info-document.c:238
-#: ../libyelp/yelp-mallard-document.c:306
-#: ../libyelp/yelp-mallard-document.c:458
-#: ../libyelp/yelp-man-document.c:282
+#: ../libyelp/yelp-docbook-document.c:297 ../libyelp/yelp-info-document.c:237
+#: ../libyelp/yelp-mallard-document.c:305
+#: ../libyelp/yelp-mallard-document.c:456 ../libyelp/yelp-man-document.c:281
 #, c-format
 msgid "The page ‘%s’ was not found in the document ‘%s’."
-msgstr "Sidan \"%s\" hittades inte i dokumentet \"%s\"."
+msgstr "Sidan ”%s” hittades inte i dokumentet ”%s”."
 
-#: ../libyelp/yelp-docbook-document.c:317
-#: ../libyelp/yelp-info-document.c:372
-#: ../libyelp/yelp-man-document.c:417
+#: ../libyelp/yelp-docbook-document.c:332 ../libyelp/yelp-info-document.c:371
+#: ../libyelp/yelp-man-document.c:416
 #, c-format
 msgid "The file does not exist."
 msgstr "Filen finns inte."
 
-#: ../libyelp/yelp-docbook-document.c:327
-#: ../libyelp/yelp-info-document.c:382
-#: ../libyelp/yelp-man-document.c:427
+#: ../libyelp/yelp-docbook-document.c:342 ../libyelp/yelp-info-document.c:381
+#: ../libyelp/yelp-man-document.c:426
 #, c-format
 msgid "The file ‘%s’ does not exist."
-msgstr "Filen \"%s\" finns inte."
+msgstr "Filen ”%s” finns inte."
 
-#: ../libyelp/yelp-docbook-document.c:342
+#: ../libyelp/yelp-docbook-document.c:357
 #, c-format
-msgid "The file ‘%s’ could not be parsed because it is not a well-formed XML document."
-msgstr "Filen \"%s\" kunde inte tolkas därför att den inte är ett korrekt formaterat XML-dokument."
+msgid ""
+"The file ‘%s’ could not be parsed because it is not a well-formed XML "
+"document."
+msgstr ""
+"Filen ”%s” kunde inte tolkas därför att den inte är ett korrekt formaterat "
+"XML-dokument."
 
-#: ../libyelp/yelp-docbook-document.c:355
+#: ../libyelp/yelp-docbook-document.c:370
 #, c-format
-msgid "The file ‘%s’ could not be parsed because one or more of its included files is not a well-formed XML document."
-msgstr "Filen \"%s\" kunde inte tolkas därför att en eller flera av dess inkluderade filer inte är korrekt formaterade XML-dokument."
+msgid ""
+"The file ‘%s’ could not be parsed because one or more of its included files "
+"is not a well-formed XML document."
+msgstr ""
+"Filen ”%s” kunde inte tolkas därför att en eller flera av dess inkluderade "
+"filer inte är korrekt formaterade XML-dokument."
 
-#: ../libyelp/yelp-docbook-document.c:765
+#: ../libyelp/yelp-docbook-document.c:803
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../libyelp/yelp-docbook-document.c:826
-#: ../libyelp/yelp-info-document.c:315
-#: ../libyelp/yelp-man-document.c:359
+#: ../libyelp/yelp-docbook-document.c:864 ../libyelp/yelp-info-document.c:314
+#: ../libyelp/yelp-man-document.c:358
 #, c-format
 msgid "The requested page was not found in the document ‘%s’."
-msgstr "Den begärda sidan hittades inte i dokumentet \"%s\"."
+msgstr "Den begärda sidan hittades inte i dokumentet ”%s”."
 
-#: ../libyelp/yelp-document.c:268
+#: ../libyelp/yelp-document.c:266
 msgid "Indexed"
 msgstr "Indexerat"
 
-#: ../libyelp/yelp-document.c:269
+#: ../libyelp/yelp-document.c:267
 msgid "Whether the document content has been indexed"
 msgstr "Huruvida dokumentets innehåll har indexerats"
 
-#: ../libyelp/yelp-document.c:277
+#: ../libyelp/yelp-document.c:275
 msgid "Document URI"
 msgstr "Dokumentets URI"
 
-#: ../libyelp/yelp-document.c:278
+#: ../libyelp/yelp-document.c:276
 msgid "The URI which identifies the document"
 msgstr "URI:n som identifierar dokumentet"
 
-#: ../libyelp/yelp-document.c:994
+#: ../libyelp/yelp-document.c:992
 #, c-format
 msgid "Search results for “%s”"
-msgstr "Sökresultat för \"%s\""
+msgstr "Sökresultat för ”%s”"
 
-#: ../libyelp/yelp-document.c:1006
+#: ../libyelp/yelp-document.c:1004
 #, c-format
 msgid "No matching help pages found in “%s”."
-msgstr "Inga matchande hjälpsidor hittades i \"%s\"."
+msgstr "Inga matchande hjälpsidor hittades i ”%s”."
 
-#: ../libyelp/yelp-document.c:1012
+#: ../libyelp/yelp-document.c:1010
 msgid "No matching help pages found."
 msgstr "Inga matchande hjälpsidor hittades."
 
-#: ../libyelp/yelp-error.c:37
+#: ../libyelp/yelp-error.c:35
 #, c-format
 msgid "An unknown error occurred."
 msgstr "Ett okänt fel har inträffat."
 
-#: ../libyelp/yelp-help-list.c:478
-#: ../libyelp/yelp-help-list.c:487
+#: ../libyelp/yelp-help-list.c:548 ../libyelp/yelp-help-list.c:557
 msgid "All Help Documents"
 msgstr "Alla hjälpdokument"
 
-#: ../libyelp/yelp-info-document.c:397
+#: ../libyelp/yelp-info-document.c:396
 #, c-format
-msgid "The file ‘%s’ could not be parsed because it is not a well-formed info page."
-msgstr "Filen \"%s\" kunde inte tolkas därför att den inte en korrekt formaterad infosida."
+msgid ""
+"The file ‘%s’ could not be parsed because it is not a well-formed info page."
+msgstr ""
+"Filen ”%s” kunde inte tolkas därför att den inte är en korrekt formaterad "
+"infosida."
 
-#: ../libyelp/yelp-location-entry.c:336
+#: ../libyelp/yelp-location-entry.c:334
 msgid "View"
 msgstr "Visa"
 
-#: ../libyelp/yelp-location-entry.c:337
+#: ../libyelp/yelp-location-entry.c:335
 msgid "A YelpView instance to control"
 msgstr "En YelpView-instans att kontrollera"
 
-#: ../libyelp/yelp-location-entry.c:352
+#: ../libyelp/yelp-location-entry.c:350
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: ../libyelp/yelp-location-entry.c:353
+#: ../libyelp/yelp-location-entry.c:351
 msgid "A YelpBookmarks implementation instance"
 msgstr "En instans för YelpBookmarks-implementation"
 
-#: ../libyelp/yelp-location-entry.c:369
+#: ../libyelp/yelp-location-entry.c:367
 msgid "Enable Search"
 msgstr "Aktivera sökning"
 
-#: ../libyelp/yelp-location-entry.c:370
+#: ../libyelp/yelp-location-entry.c:368
 msgid "Whether the location entry can be used as a search field"
 msgstr "Huruvida platsinmatningen kan användas som ett sökfält"
 
-#: ../libyelp/yelp-location-entry.c:440
-#: ../src/yelp-window.c:270
+#: ../libyelp/yelp-location-entry.c:438 ../src/yelp-window.c:268
 msgid "Search..."
-msgstr "Sök..."
+msgstr "Sök…"
 
-#: ../libyelp/yelp-location-entry.c:783
+#: ../libyelp/yelp-location-entry.c:781
 msgid "Clear the search text"
 msgstr "Töm sökfältet"
 
-#: ../libyelp/yelp-location-entry.c:831
-#: ../libyelp/yelp-location-entry.c:1593
+#: ../libyelp/yelp-location-entry.c:829 ../libyelp/yelp-location-entry.c:1591
 msgid "Bookmark this page"
 msgstr "Bokmärk denna sida"
 
-#: ../libyelp/yelp-location-entry.c:839
-#: ../libyelp/yelp-location-entry.c:1601
+#: ../libyelp/yelp-location-entry.c:837 ../libyelp/yelp-location-entry.c:1599
 msgid "Remove bookmark"
 msgstr "Ta bort bokmärke"
 
-#: ../libyelp/yelp-location-entry.c:1154
+#: ../libyelp/yelp-location-entry.c:1152
 #, c-format
 msgid "Search for “%s”"
-msgstr "Sök efter \"%s\""
+msgstr "Sök efter ”%s”"
 
-#: ../libyelp/yelp-location-entry.c:1458
+#: ../libyelp/yelp-location-entry.c:1456
 msgid "Loading"
 msgstr "Läser in"
 
-#: ../libyelp/yelp-mallard-document.c:346
+#: ../libyelp/yelp-mallard-document.c:344
 #, c-format
 msgid "The directory ‘%s’ does not exist."
-msgstr "Katalogen \"%s\" finns inte."
+msgstr "Katalogen ”%s” finns inte."
 
 #: ../libyelp/yelp-settings.c:154
 msgid "GtkSettings"
@@ -227,325 +233,324 @@ msgstr "Redigeringsläge"
 msgid "Enable features useful to editors"
 msgstr "Aktivera funktioner användbara för redigerare"
 
-#: ../libyelp/yelp-sqlite-storage.c:150
+#: ../libyelp/yelp-sqlite-storage.c:147
 msgid "Database filename"
 msgstr "Databasens filnamn"
 
-#: ../libyelp/yelp-sqlite-storage.c:151
+#: ../libyelp/yelp-sqlite-storage.c:148
 msgid "The filename of the sqlite database"
 msgstr "Filnamnet för sqlite-databasen"
 
-#: ../libyelp/yelp-transform.c:171
+#: ../libyelp/yelp-transform.c:169
 msgid "XSLT Stylesheet"
 msgstr "XSLT-stilmall"
 
-#: ../libyelp/yelp-transform.c:172
+#: ../libyelp/yelp-transform.c:170
 msgid "The location of the XSLT stylesheet"
 msgstr "Platsen för XSLT-stilmallen"
 
-#: ../libyelp/yelp-transform.c:379
-#: ../libyelp/yelp-transform.c:394
+#: ../libyelp/yelp-transform.c:378 ../libyelp/yelp-transform.c:393
 #, c-format
 msgid "The XSLT stylesheet ‘%s’ is either missing or not valid."
-msgstr "XSLT-stilmallen \"%s\" antingen saknas eller är inte giltig."
+msgstr "XSLT-stilmallen ”%s” antingen saknas eller är inte giltig."
 
-#: ../libyelp/yelp-transform.c:528
+#: ../libyelp/yelp-transform.c:527
 msgid "No href attribute found on yelp:document\n"
 msgstr "Inget href-attribut hittat på yelp:document\n"
 
-#: ../libyelp/yelp-transform.c:543
+#: ../libyelp/yelp-transform.c:542
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ../libyelp/yelp-view.c:131
+#: ../libyelp/yelp-view.c:129
 msgid "_Print..."
-msgstr "Skriv _ut..."
+msgstr "Skriv _ut…"
 
-#: ../libyelp/yelp-view.c:136
+#: ../libyelp/yelp-view.c:134
 msgid "_Back"
 msgstr "_Bakåt"
 
-#: ../libyelp/yelp-view.c:141
+#: ../libyelp/yelp-view.c:139
 msgid "_Forward"
 msgstr "_Framåt"
 
-#: ../libyelp/yelp-view.c:146
+#: ../libyelp/yelp-view.c:144
 msgid "_Previous Page"
 msgstr "_Föregående sida"
 
-#: ../libyelp/yelp-view.c:151
+#: ../libyelp/yelp-view.c:149
 msgid "_Next Page"
 msgstr "_Nästa sida"
 
-#: ../libyelp/yelp-view.c:423
+#: ../libyelp/yelp-view.c:421
 msgid "Yelp URI"
-msgstr "Yelp URI"
+msgstr "Yelp-URI"
 
-#: ../libyelp/yelp-view.c:424
+#: ../libyelp/yelp-view.c:422
 msgid "A YelpUri with the current location"
 msgstr "En YelpUri med den aktuella platsen"
 
-#: ../libyelp/yelp-view.c:432
+#: ../libyelp/yelp-view.c:430
 msgid "Loading State"
 msgstr "Inläsningstillstånd"
 
-#: ../libyelp/yelp-view.c:433
+#: ../libyelp/yelp-view.c:431
 msgid "The loading state of the view"
 msgstr "Inläsningstillståndet för vyn"
 
-#: ../libyelp/yelp-view.c:442
+#: ../libyelp/yelp-view.c:440
 msgid "Page ID"
-msgstr "Sidans id"
+msgstr "Sidans ID"
 
-#: ../libyelp/yelp-view.c:443
+#: ../libyelp/yelp-view.c:441
 msgid "The ID of the root page of the page being viewed"
 msgstr "ID för rotsidan för sidan som visas"
 
-#: ../libyelp/yelp-view.c:451
+#: ../libyelp/yelp-view.c:449
 msgid "Root Title"
 msgstr "Rottitel"
 
-#: ../libyelp/yelp-view.c:452
+#: ../libyelp/yelp-view.c:450
 msgid "The title of the root page of the page being viewed"
 msgstr "Titeln för rotsidan för sidan som visas"
 
-#: ../libyelp/yelp-view.c:460
+#: ../libyelp/yelp-view.c:458
 msgid "Page Title"
 msgstr "Sidtitel"
 
-#: ../libyelp/yelp-view.c:461
+#: ../libyelp/yelp-view.c:459
 msgid "The title of the page being viewed"
 msgstr "Titeln för sidan som visas"
 
-#: ../libyelp/yelp-view.c:469
+#: ../libyelp/yelp-view.c:467
 msgid "Page Description"
 msgstr "Sidbeskrivning"
 
-#: ../libyelp/yelp-view.c:470
+#: ../libyelp/yelp-view.c:468
 msgid "The description of the page being viewed"
 msgstr "Beskrivningen för sidan som visas"
 
-#: ../libyelp/yelp-view.c:478
+#: ../libyelp/yelp-view.c:476
 msgid "Page Icon"
 msgstr "Sidikon"
 
-#: ../libyelp/yelp-view.c:479
+#: ../libyelp/yelp-view.c:477
 msgid "The icon of the page being viewed"
 msgstr "Ikonen för sidan som visas"
 
-#: ../libyelp/yelp-view.c:720
+#: ../libyelp/yelp-view.c:718
 msgid "You do not have PackageKit. Package install links require PackageKit."
-msgstr "Du har inte PackageKit. Länkar för paketinstallationer kräver PackageKit."
+msgstr ""
+"Du har inte PackageKit. Länkar för paketinstallationer kräver PackageKit."
 
-#: ../libyelp/yelp-view.c:1013
+#: ../libyelp/yelp-view.c:1012
 msgid "Save Image"
 msgstr "Spara bild"
 
-#: ../libyelp/yelp-view.c:1108
+#: ../libyelp/yelp-view.c:1107
 msgid "Save Code"
 msgstr "Spara källkod"
 
-#: ../libyelp/yelp-view.c:1271
+#: ../libyelp/yelp-view.c:1270
 #, c-format
 msgid "Send email to %s"
 msgstr "Skicka e-post till %s"
 
-#: ../libyelp/yelp-view.c:1286
+#: ../libyelp/yelp-view.c:1285
 msgid "_Install Packages"
 msgstr "_Installera paket"
 
-#: ../libyelp/yelp-view.c:1294
+#: ../libyelp/yelp-view.c:1293
 msgid "_Open Link"
 msgstr "_Öppna länk"
 
-#: ../libyelp/yelp-view.c:1301
+#: ../libyelp/yelp-view.c:1300
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkplats"
 
-#: ../libyelp/yelp-view.c:1307
+#: ../libyelp/yelp-view.c:1306
 msgid "Open Link in New _Window"
 msgstr "Öppna länk i nytt _fönster"
 
-#: ../libyelp/yelp-view.c:1359
+#: ../libyelp/yelp-view.c:1358
 msgid "_Save Image As..."
-msgstr "_Spara bild som..."
+msgstr "_Spara bild som…"
 
-#: ../libyelp/yelp-view.c:1361
+#: ../libyelp/yelp-view.c:1360
 msgid "_Save Video As..."
-msgstr "_Spara video som..."
+msgstr "_Spara video som…"
 
-#: ../libyelp/yelp-view.c:1368
+#: ../libyelp/yelp-view.c:1367
 msgid "S_end Image To..."
-msgstr "S_kicka bild till..."
+msgstr "S_kicka bild till…"
 
-#: ../libyelp/yelp-view.c:1370
+#: ../libyelp/yelp-view.c:1369
 msgid "S_end Video To..."
-msgstr "S_kicka video till..."
+msgstr "S_kicka video till…"
 
-#: ../libyelp/yelp-view.c:1381
+#: ../libyelp/yelp-view.c:1380
 msgid "_Copy Text"
 msgstr "_Kopiera text"
 
-#: ../libyelp/yelp-view.c:1394
+#: ../libyelp/yelp-view.c:1393
 msgid "C_opy Code Block"
 msgstr "K_opiera källkodsblock"
 
-#: ../libyelp/yelp-view.c:1399
+#: ../libyelp/yelp-view.c:1398
 msgid "Save Code _Block As..."
-msgstr "Spara källkods_block som..."
+msgstr "Spara källkods_block som…"
 
-#: ../libyelp/yelp-view.c:1497
+#: ../libyelp/yelp-view.c:1505
 #, c-format
 msgid "See all search results for “%s”"
-msgstr "Se alla sökresultat för \"%s\""
+msgstr "Se alla sökresultat för ”%s”"
 
-#: ../libyelp/yelp-view.c:1618
+#: ../libyelp/yelp-view.c:1626
 #, c-format
 msgid "Could not load a document for ‘%s’"
-msgstr "Kunde inte läsa in ett dokument för \"%s\""
+msgstr "Kunde inte läsa in ett dokument för ”%s”"
 
-#: ../libyelp/yelp-view.c:1624
+#: ../libyelp/yelp-view.c:1632
 #, c-format
 msgid "Could not load a document"
 msgstr "Kunde inte läsa in ett dokument"
 
-#: ../libyelp/yelp-view.c:1698
+#: ../libyelp/yelp-view.c:1707
 msgid "Document Not Found"
 msgstr "Dokumentet hittades inte"
 
-#: ../libyelp/yelp-view.c:1700
+#: ../libyelp/yelp-view.c:1709
 msgid "Page Not Found"
 msgstr "Sidan hittades inte"
 
-#: ../libyelp/yelp-view.c:1703
+#: ../libyelp/yelp-view.c:1712
 msgid "Cannot Read"
 msgstr "Kan inte läsa"
 
-#: ../libyelp/yelp-view.c:1709
+#: ../libyelp/yelp-view.c:1718
 msgid "Unknown Error"
 msgstr "Okänt fel"
 
-#: ../libyelp/yelp-view.c:1729
+#: ../libyelp/yelp-view.c:1738
 msgid "Search for packages containing this document."
 msgstr "Sök efter paket som innehåller detta dokument."
 
-#: ../libyelp/yelp-view.c:1882
+#: ../libyelp/yelp-view.c:1890
 #, c-format
 msgid "The URI ‘%s’ does not point to a valid page."
-msgstr "URI:n \"%s\" pekar inte till en giltig sida."
+msgstr "URI:n ”%s” pekar inte på en giltig sida."
 
-#: ../libyelp/yelp-view.c:1888
+#: ../libyelp/yelp-view.c:1896
 #, c-format
 msgid "The URI does not point to a valid page."
 msgstr "URI:n pekar inte på en giltig sida."
 
-#: ../libyelp/yelp-view.c:1894
+#: ../libyelp/yelp-view.c:1902
 #, c-format
 msgid "The URI ‘%s’ could not be parsed."
-msgstr "URI:n \"%s\" kunde inte tolkas."
+msgstr "URI:n ”%s” kunde inte tolkas."
 
-#: ../src/yelp-application.c:65
+#: ../src/yelp-application.c:63
 msgid "Turn on editor mode"
 msgstr "Aktivera redigeringsläge"
 
-#: ../src/yelp-application.c:128
+#: ../src/yelp-application.c:126
 msgid "_Larger Text"
 msgstr "S_törre text"
 
-#: ../src/yelp-application.c:130
+#: ../src/yelp-application.c:128
 msgid "Increase the size of the text"
 msgstr "Öka storleken på texten"
 
-#: ../src/yelp-application.c:133
+#: ../src/yelp-application.c:131
 msgid "_Smaller Text"
 msgstr "M_indre text"
 
-#: ../src/yelp-application.c:135
+#: ../src/yelp-application.c:133
 msgid "Decrease the size of the text"
 msgstr "Minska storleken på texten"
 
-#: ../src/yelp-application.c:253
-#: ../src/yelp-window.c:1360
+#: ../src/yelp-application.c:251 ../src/yelp-window.c:1358
 #: ../yelp.desktop.in.in.h:1
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../src/yelp-application.c:288
+#: ../src/yelp-application.c:286
 msgid "Show Text _Cursor"
 msgstr "Visa text_markör"
 
-#: ../src/yelp-window.c:236
+#: ../src/yelp-window.c:234
 msgid "_Page"
 msgstr "Si_da"
 
-#: ../src/yelp-window.c:237
+#: ../src/yelp-window.c:235
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/yelp-window.c:238
+#: ../src/yelp-window.c:236
 msgid "_Go"
 msgstr "_Gå"
 
-#: ../src/yelp-window.c:239
+#: ../src/yelp-window.c:237
 msgid "_Bookmarks"
 msgstr "_Bokmärken"
 
-#: ../src/yelp-window.c:242
+#: ../src/yelp-window.c:240
 msgid "_New Window"
 msgstr "_Nytt fönster"
 
-#: ../src/yelp-window.c:247
+#: ../src/yelp-window.c:245
 msgid "_Close"
 msgstr "S_täng"
 
-#: ../src/yelp-window.c:252
+#: ../src/yelp-window.c:250
 msgid "_All Documents"
 msgstr "_Alla dokument"
 
-#: ../src/yelp-window.c:256
+#: ../src/yelp-window.c:254
 msgid "_Add Bookmark"
 msgstr "_Lägg till bokmärke"
 
-#: ../src/yelp-window.c:261
+#: ../src/yelp-window.c:259
 msgid "_Remove Bookmark"
 msgstr "_Ta bort bokmärke"
 
-#: ../src/yelp-window.c:265
+#: ../src/yelp-window.c:263
 msgid "Find in Page..."
-msgstr "Sök på sida..."
+msgstr "Sök på sida…"
 
-#: ../src/yelp-window.c:275
+#: ../src/yelp-window.c:273
 msgid "Open Location"
 msgstr "Öppna plats"
 
-#: ../src/yelp-window.c:301
+#: ../src/yelp-window.c:299
 msgid "Application"
 msgstr "Program"
 
-#: ../src/yelp-window.c:302
+#: ../src/yelp-window.c:300
 msgid "A YelpApplication instance that controls this window"
 msgstr "En YelpApplication-instans som kontrollerar detta fönster"
 
-#: ../src/yelp-window.c:429
+#: ../src/yelp-window.c:427
 msgid "Read Link _Later"
 msgstr "Läs _länk senare"
 
-#: ../src/yelp-window.c:526
+#: ../src/yelp-window.c:524
 msgid "Find:"
 msgstr "Sök:"
 
-#: ../src/yelp-window.c:548
+#: ../src/yelp-window.c:546
 msgid "Read Later"
 msgstr "Läs senare"
 
-#: ../src/yelp-window.c:1180
+#: ../src/yelp-window.c:1178
 #, c-format
 msgid "%i match"
 msgid_plural "%i matches"
 msgstr[0] "%i sökträff"
 msgstr[1] "%i sökträffar"
 
-#: ../src/yelp-window.c:1189
+#: ../src/yelp-window.c:1187
 msgid "No matches"
 msgstr "Inga sökträffar"
 
@@ -553,6 +558,10 @@ msgstr "Inga sökträffar"
 msgid "Get help with GNOME"
 msgstr "Få hjälp med GNOME"
 
+#: ../yelp.desktop.in.in.h:3
+msgid "documentation;information;manual;"
+msgstr "dokumentation;information;manual;handbok;"
+
 #~ msgid "_Share..."
 #~ msgstr "_Dela..."
 
diff --git a/src/yelp-application.c b/src/yelp-application.c
index 42deb074..20c8266a 100644
--- a/src/yelp-application.c
+++ b/src/yelp-application.c
@@ -28,7 +28,9 @@
 #include <gio/gsettingsbackend.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#endif
 #include <stdlib.h>
 
 #include "yelp-bookmarks.h"
@@ -466,18 +468,25 @@ application_uri_resolved (YelpUri             *uri,
 
     /* Metacity no longer does anything useful with gtk_window_present */
     gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
-    if (gdk_window)
-        gdk_x11_window_move_to_current_desktop (gdk_window);
 
-    /* Ensure we actually present the window when invoked from the command
-     * line. This is somewhat evil, but the minor evil of Yelp stealing
-     * focus (after you requested it) is outweighed for me by the major
-     * evil of no help window appearing when you click Help.
-     */
-    if (data->timestamp == 0)
-        data->timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window)));
+#ifdef GDK_WINDOWING_X11
+    if (GDK_IS_X11_WINDOW (gdk_window)){
+        if (gdk_window)
+            gdk_x11_window_move_to_current_desktop (gdk_window);
+
+        /* Ensure we actually present the window when invoked from the command
+         * line. This is somewhat evil, but the minor evil of Yelp stealing
+         * focus (after you requested it) is outweighed for me by the major
+         * evil of no help window appearing when you click Help.
+         */
+        if (data->timestamp == 0)
+            data->timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window)));
 
-    gtk_window_present_with_time (GTK_WINDOW (window), data->timestamp);
+        gtk_window_present_with_time (GTK_WINDOW (window), data->timestamp);
+    }
+    else
+#endif
+        gtk_window_present (GTK_WINDOW (window));
 
     g_object_unref (uri);
     g_free (data);
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 3ffaccba..6cac2908 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -259,7 +259,7 @@ yelp_window_dispose (GObject *object)
     YelpWindowPrivate *priv = GET_PRIV (object);
 
     if (priv->bookmarks_changed) {
-        g_source_remove (priv->bookmarks_changed);
+        g_signal_handler_disconnect (priv->application, priv->bookmarks_changed);
         priv->bookmarks_changed = 0;
     }
 
diff --git a/yelp.doap b/yelp.doap
index 0f674dd6..e9e44b37 100644
--- a/yelp.doap
+++ b/yelp.doap
@@ -7,9 +7,10 @@
   <name xml:lang="en">Help</name>
   <shortdesc xml:lang="en">Get help with GNOME</shortdesc>
 
+  <homepage rdf:resource="https://wiki.gnome.org/Apps/Yelp" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-doc-devel-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/yelp/" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=Yelp" />
+  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=Yelp" />
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
 
   <maintainer>