summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2021-07-24 11:10:25 -0400
committerShaun McCance <shaunm@gnome.org>2021-07-24 11:10:25 -0400
commitcb6ccd49470f74b3dcdf6abaedc0c7eff900bb92 (patch)
treec3da4c42fc452ee9c50e154dc8e1803d6c140c6b
parent248359857ed254e61c4aa6e49ece183042b918c6 (diff)
parentb061af697610715a48fda8c81e0430543a58a352 (diff)
downloadyelp-cb6ccd49470f74b3dcdf6abaedc0c7eff900bb92.tar.gz
Merge remote-tracking branch 'origin/master' into 41-settings-revamp
-rw-r--r--README5
-rw-r--r--configure.ac6
-rw-r--r--libyelp/yelp-uri-builder.c64
-rw-r--r--libyelp/yelp-uri-builder.h3
-rw-r--r--libyelp/yelp-uri.h1
-rw-r--r--libyelp/yelp-view.c28
-rw-r--r--po/oc.po490
7 files changed, 308 insertions, 289 deletions
diff --git a/README b/README
index fa3004b9..6177d742 100644
--- a/README
+++ b/README
@@ -13,10 +13,9 @@ development in GNOME:
https://gitlab.gnome.org/GNOME/yelp/
-Bugs are tracking in GNOME Bugzilla, product yelp:
+Bugs are tracking in the GNOME issue tracker, product yelp:
- https://bugzilla.gnome.org/page.cgi?id=browse.html&product=yelp
- https://bugzilla.gnome.org/enter_bug.cgi?product=yelp
+ https://gitlab.gnome.org/GNOME/yelp/-/issues/
Yelp is distributed under the GNU General Public License, version 2
or later. See the COPYING file for details.
diff --git a/configure.ac b/configure.ac
index d9b3211b..037fdaa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ APPSTREAM_XML
LT_LIB_M
PKG_CHECK_MODULES(YELP,
[
- gio-2.0 >= 2.38.0
+ gio-2.0 >= 2.67.4
gio-unix-2.0
gtk+-unix-print-3.0
gtk+-3.0 >= 3.13.3
@@ -34,7 +34,7 @@ PKG_CHECK_MODULES(YELP,
libxslt >= 1.1.4
libexslt >= 0.8.1
sqlite3
- webkit2gtk-4.0 >= 2.19.2
+ webkit2gtk-4.1
yelp-xsl >= 40.0
])
AC_SUBST([YELP_CFLAGS])
@@ -45,7 +45,7 @@ AC_SUBST([YELP_LIBS])
LT_PREREQ([2.2.6])
LT_INIT
-PKG_CHECK_MODULES([YELP_EXTENSION], [webkit2gtk-web-extension-4.0 >= 2.7.2])
+PKG_CHECK_MODULES([YELP_EXTENSION], [webkit2gtk-web-extension-4.1])
AC_SUBST(YELP_EXTENSION_CFLAGS)
AC_SUBST(YELP_EXTENSION_LIBS)
diff --git a/libyelp/yelp-uri-builder.c b/libyelp/yelp-uri-builder.c
index 7f1829d3..9a8bdcf7 100644
--- a/libyelp/yelp-uri-builder.c
+++ b/libyelp/yelp-uri-builder.c
@@ -26,45 +26,59 @@
gchar *
build_network_uri (const gchar *uri)
{
- SoupURI *soup_uri;
- gchar *bogus_scheme, *path, *retval;
+ GUri *guri, *network_uri;
+ gchar *bogus_scheme;
+ gchar *path = NULL;
+ gchar *retval;
+ const gchar *scheme;
+ const char *fragment;
- soup_uri = soup_uri_new (uri);
+ scheme = g_uri_peek_scheme (uri);
/* Don't mangle URIs for local files */
- if (soup_uri->scheme == SOUP_URI_SCHEME_FILE)
+ if (g_str_equal (scheme, "file"))
return g_strdup (uri);
+ /* We need to use a different scheme from help or ghelp to be able to deal
+ with absolute uris in the HTML. Help uri schemes are help:gnome-help/...
+ they dont have a slash after the colon so WebKit resolves them as a relative
+ url when they are not. This doesn't happen if the current page URI has a different
+ scheme from absolute uri scheme.
+ */
+ bogus_scheme = build_network_scheme (scheme);
+
+ guri = g_uri_parse (uri, G_URI_FLAGS_ENCODED, NULL);
+ fragment = g_uri_get_fragment (guri);
+
/* Build the URI that will be passed to WebKit. Relative URIs will be
* automatically resolved by WebKit, so we need to add a leading slash to
* help: and ghelp: URIs to be considered as absolute by WebKit.
*/
- if (g_str_equal (soup_uri->scheme, "ghelp") || g_str_equal (soup_uri->scheme, "gnome-help") ||
- g_str_equal (soup_uri->scheme, "help") || g_str_equal (soup_uri->scheme, "help-list") ||
- g_str_equal (soup_uri->scheme, "info") || g_str_equal (soup_uri->scheme, "man")) {
-
- if (g_str_equal (soup_uri->scheme, "info") && soup_uri->fragment) {
- path = g_strdup_printf ("/%s/%s", soup_uri->path, soup_uri->fragment);
- soup_uri_set_fragment (soup_uri, NULL);
+ if (g_str_equal (scheme, "ghelp") || g_str_equal (scheme, "gnome-help") ||
+ g_str_equal (scheme, "help") || g_str_equal (scheme, "help-list") ||
+ g_str_equal (scheme, "info") || g_str_equal (scheme, "man")) {
+ if (g_str_equal (scheme, "info") && fragment) {
+ path = g_strdup_printf ("/%s/%s", g_uri_get_path (guri), fragment);
+ fragment = NULL;
} else {
- path = g_strdup_printf ("/%s", soup_uri->path);
+ path = g_strdup_printf ("/%s", g_uri_get_path (guri));
}
- soup_uri_set_path (soup_uri, path);
- g_free (path);
}
- /* We need to use a different scheme from help or ghelp to be able to deal
- with absolute uris in the HTML. Help uri schemes are help:gnome-help/...
- they dont have a slash after the colon so WebKit resolves them as a relative
- url when they are not. This doesn't happen if the current page URI has a different
- scheme from absolute uri scheme.
- */
- bogus_scheme = build_network_scheme (soup_uri->scheme);
- soup_uri_set_scheme (soup_uri, bogus_scheme);
-
- retval = soup_uri_to_string (soup_uri, FALSE);
- soup_uri_free (soup_uri);
+ network_uri = g_uri_build (g_uri_get_flags (guri),
+ bogus_scheme,
+ g_uri_get_userinfo (guri),
+ g_uri_get_host (guri),
+ g_uri_get_port (guri),
+ path ? path : g_uri_get_path (guri),
+ g_uri_get_query (guri),
+ fragment);
g_free (bogus_scheme);
+ g_free (path);
+ g_uri_unref (guri);
+
+ retval = g_uri_to_string (network_uri);
+ g_uri_unref (network_uri);
return retval;
}
diff --git a/libyelp/yelp-uri-builder.h b/libyelp/yelp-uri-builder.h
index d6effa4c..049b9a03 100644
--- a/libyelp/yelp-uri-builder.h
+++ b/libyelp/yelp-uri-builder.h
@@ -19,10 +19,9 @@
*/
#include <string.h>
-#include <libsoup/soup.h>
#include "yelp-uri.h"
gchar * build_network_uri (const gchar *uri);
gchar * build_yelp_uri (const gchar *uri);
-gchar * build_network_scheme (const gchar *scheme); \ No newline at end of file
+gchar * build_network_scheme (const gchar *scheme);
diff --git a/libyelp/yelp-uri.h b/libyelp/yelp-uri.h
index 7218a8a5..68bbc686 100644
--- a/libyelp/yelp-uri.h
+++ b/libyelp/yelp-uri.h
@@ -22,6 +22,7 @@
#define __YELP_URI_H__
#include <glib-object.h>
+#include <gio/gio.h>
G_BEGIN_DECLS
diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index b4ac84e1..1f10000c 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -1847,11 +1847,12 @@ view_clear_load (YelpView *view)
static gchar*
fix_docbook_uri (YelpUri *docbook_uri, YelpDocument* document)
{
- SoupURI *soup_uri;
+ GUri *uri;
gchar *retval, *canonical;
+ const gchar *fragment;
canonical = yelp_uri_get_canonical_uri (docbook_uri);
- soup_uri = soup_uri_new (canonical);
+ uri = g_uri_parse (canonical, G_URI_FLAGS_ENCODED, NULL);
g_free (canonical);
/* We don't have actual page and frag IDs for DocBook. We just map IDs
@@ -1859,19 +1860,32 @@ fix_docbook_uri (YelpUri *docbook_uri, YelpDocument* document)
If someid is really the page ID, we just drop the frag reference.
Otherwise, normal page views scroll past the link trail.
*/
- if (soup_uri->fragment && YELP_IS_DOCBOOK_DOCUMENT (document)) {
+ fragment = g_uri_get_fragment (uri);
+ if (fragment && YELP_IS_DOCBOOK_DOCUMENT (document)) {
gchar *page_id = yelp_uri_get_page_id (docbook_uri);
gchar *real_id = yelp_document_get_page_id (document, page_id);
- if (g_str_equal (real_id, soup_uri->fragment))
- soup_uri_set_fragment (soup_uri, NULL);
+ if (g_str_equal (real_id, fragment)) {
+ GUri *modified;
+
+ modified = g_uri_build (g_uri_get_flags (uri),
+ g_uri_get_scheme (uri),
+ g_uri_get_userinfo (uri),
+ g_uri_get_host (uri),
+ g_uri_get_port (uri),
+ g_uri_get_path (uri),
+ g_uri_get_query (uri),
+ NULL);
+ g_uri_unref (uri);
+ uri = modified;
+ }
g_free (real_id);
g_free (page_id);
}
- retval = soup_uri_to_string (soup_uri, FALSE);
- soup_uri_free (soup_uri);
+ retval = g_uri_to_string (uri);
+ g_uri_unref (uri);
return retval;
}
diff --git a/po/oc.po b/po/oc.po
index ea1d7aad..e7d7e625 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -9,10 +9,9 @@
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: 2016-05-10 16:56+0000\n"
-"PO-Revision-Date: 2016-05-08 18:53+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/yelp/issues\n"
+"POT-Creation-Date: 2021-06-06 16:40+0000\n"
+"PO-Revision-Date: 2021-06-12 22:32+0200\n"
"Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
"Language-Team: Tot En Òc\n"
"Language: oc\n"
@@ -20,7 +19,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.3\n"
"X-Launchpad-Export-Date: 2016-04-06 19:04+0000\n"
"X-Project-Style: gnome\n"
@@ -34,40 +33,73 @@ msgstr ""
#.
#. <string/> - The package to install
#.
-#: yelp.xml.in:36
+#: data/domains/yelp.xml.in:36
msgid "Install <string/>"
msgstr "Installar <string/>"
-#: ../libyelp/yelp-bz2-decompressor.c:143
-#: ../libyelp/yelp-lzma-decompressor.c:152
+#: data/yelp.appdata.xml.in:6
+msgid "GNOME Help"
+msgstr "Ajuda de GNOME"
+
+#: data/yelp.appdata.xml.in:7
+msgid "Help viewer for GNOME"
+msgstr "Visionador d’ajuda de GNOME"
+
+#: data/yelp.appdata.xml.in:9
+msgid ""
+"Yelp is the GNOME help viewer. It is the default Mallard viewer, but it can "
+"also display DocBook, info, man, and HTML documentation."
+msgstr ""
+"Yelp es lo visionador d'ajuda de GNOME. Es lo visionador Mallard per defaut, "
+"mas pòt tanben afichar la documentacion DocBook, info, man e HTML."
+
+#: data/yelp.appdata.xml.in:13
+msgid ""
+"It makes it easy to find the documentation you need, with interactive search "
+"and bookmarks."
+msgstr ""
+"Rend facil la recèrca de documentacion que vos fa mestièr amb recèrca "
+"interactiva e marcapaginas."
+
+#: data/yelp.appdata.xml.in:17
+msgid ""
+"It also has an editor mode, which shows editorial comments and revision "
+"statuses when editing Mallard documents."
+msgstr ""
+"Possedís tanben un mòde editor, que mòstra los comentaris editorials e los "
+"estatuts de revision pendent las modificacions de documents Mallards."
+
+#: data/yelp.appdata.xml.in:30
+msgid "The GNOME Project"
+msgstr "Lo projècte GNOME"
+
+#: libyelp/yelp-bz2-decompressor.c:143 libyelp/yelp-lzma-decompressor.c:152
msgid "Invalid compressed data"
msgstr "Donadas compressadas invalidas"
-#: ../libyelp/yelp-bz2-decompressor.c:149
-#: ../libyelp/yelp-lzma-decompressor.c:158
+#: libyelp/yelp-bz2-decompressor.c:149 libyelp/yelp-lzma-decompressor.c:158
msgid "Not enough memory"
msgstr "Memòria insufisenta"
-#: ../libyelp/yelp-docbook-document.c:282 ../libyelp/yelp-info-document.c:218
-#: ../libyelp/yelp-mallard-document.c:298
-#: ../libyelp/yelp-mallard-document.c:452 ../libyelp/yelp-man-document.c:252
+#: libyelp/yelp-docbook-document.c:292 libyelp/yelp-info-document.c:220
+#: libyelp/yelp-mallard-document.c:306 libyelp/yelp-mallard-document.c:464
+#: libyelp/yelp-man-document.c:198
#, c-format
msgid "The page ‘%s’ was not found in the document ‘%s’."
msgstr "La pagina « %s » es pas estada trobada dins lo document « %s »."
-#: ../libyelp/yelp-docbook-document.c:320 ../libyelp/yelp-info-document.c:355
-#: ../libyelp/yelp-man-document.c:390
-#, c-format
+#: libyelp/yelp-docbook-document.c:331 libyelp/yelp-info-document.c:357
+#: libyelp/yelp-man-document.c:335
msgid "The file does not exist."
msgstr "Lo fichièr existís pas."
-#: ../libyelp/yelp-docbook-document.c:330 ../libyelp/yelp-info-document.c:365
-#: ../libyelp/yelp-man-document.c:400
+#: libyelp/yelp-docbook-document.c:341 libyelp/yelp-info-document.c:367
+#: libyelp/yelp-man-document.c:345
#, c-format
msgid "The file ‘%s’ does not exist."
msgstr "Lo fichièr « %s » existís pas."
-#: ../libyelp/yelp-docbook-document.c:345
+#: libyelp/yelp-docbook-document.c:359
#, c-format
msgid ""
"The file ‘%s’ could not be parsed because it is not a well-formed XML "
@@ -76,7 +108,7 @@ msgstr ""
"Lo fichièr « %s » a pas pogut èsser analisat, perque es pas un document XML "
"format corrèctament."
-#: ../libyelp/yelp-docbook-document.c:358
+#: libyelp/yelp-docbook-document.c:372
#, c-format
msgid ""
"The file ‘%s’ could not be parsed because one or more of its included files "
@@ -85,56 +117,39 @@ msgstr ""
"Lo fichièr « %s » a pas pogut èsser analisat, perque un o mantun de sos "
"fichièrs incluses es pas un document XML format corrèctament."
-#: ../libyelp/yelp-docbook-document.c:788
+#: libyelp/yelp-docbook-document.c:807
msgid "Unknown"
msgstr "Desconegut"
-#: ../libyelp/yelp-docbook-document.c:850 ../libyelp/yelp-info-document.c:298
-#: ../libyelp/yelp-man-document.c:332
+#: libyelp/yelp-docbook-document.c:905 libyelp/yelp-info-document.c:300
+#: libyelp/yelp-man-document.c:278
#, c-format
msgid "The requested page was not found in the document ‘%s’."
msgstr "La pagina demandada es pas estada trobada dins lo document « %s »."
-#: ../libyelp/yelp-document.c:278
-msgid "Indexed"
-msgstr "Indexat"
-
-#: ../libyelp/yelp-document.c:279
-msgid "Whether the document content has been indexed"
-msgstr "Indica se lo contengut del document es estat indexat o pas"
-
-#: ../libyelp/yelp-document.c:287
-msgid "Document URI"
-msgstr "URI del document"
-
-#: ../libyelp/yelp-document.c:288
-msgid "The URI which identifies the document"
-msgstr "L'URI qu'identifica lo document"
-
-#: ../libyelp/yelp-document.c:1024
+#: libyelp/yelp-document.c:1064
#, c-format
msgid "Search results for “%s”"
msgstr "Resultats de la recèrca per « %s »"
-#: ../libyelp/yelp-document.c:1036
+#: libyelp/yelp-document.c:1076
#, c-format
msgid "No matching help pages found in “%s”."
msgstr "Cap de pagina d'ajuda correspondenta pas trobada dins « %s »."
-#: ../libyelp/yelp-document.c:1042
+#: libyelp/yelp-document.c:1082
msgid "No matching help pages found."
msgstr "Cap de pagina d'ajuda correspondenta pas trobada."
-#: ../libyelp/yelp-error.c:35
-#, c-format
+#: libyelp/yelp-error.c:35
msgid "An unknown error occurred."
msgstr "Una error desconeguda s'es produita."
-#: ../libyelp/yelp-help-list.c:545 ../libyelp/yelp-help-list.c:554
+#: libyelp/yelp-help-list.c:545 libyelp/yelp-help-list.c:554
msgid "All Help Documents"
msgstr "Totes los documents d'ajuda"
-#: ../libyelp/yelp-info-document.c:380
+#: libyelp/yelp-info-document.c:382
#, c-format
msgid ""
"The file ‘%s’ could not be parsed because it is not a well-formed info page."
@@ -142,354 +157,331 @@ msgstr ""
"Lo fichièr « %s » a pas pogut èsser analisat, perque es pas una pagina info "
"formada corrèctament."
-#: ../libyelp/yelp-mallard-document.c:340
+#: libyelp/yelp-mallard-document.c:348
#, c-format
msgid "The directory ‘%s’ does not exist."
msgstr "Lo repertòri « %s » existís pas."
-#: ../libyelp/yelp-search-entry.c:172
-msgid "View"
-msgstr "Vista"
-
-#: ../libyelp/yelp-search-entry.c:173
-msgid "A YelpView instance to control"
-msgstr "Una instància YelpView de contrarotlar"
-
-#: ../libyelp/yelp-search-entry.c:188 ../src/yelp-window.c:417
-msgid "Bookmarks"
-msgstr "Marcapaginas"
-
-#: ../libyelp/yelp-search-entry.c:189
-msgid "A YelpBookmarks implementation instance"
-msgstr "Una instància d'implementacion de YelpBookmarks"
-
-#: ../libyelp/yelp-search-entry.c:433
+#: libyelp/yelp-search-entry.c:435
#, c-format
msgid "Search for “%s”"
msgstr "Recèrca de « %s »"
-#: ../libyelp/yelp-settings.c:148
-msgid "GtkSettings"
-msgstr "GtkSettings"
-
-#: ../libyelp/yelp-settings.c:149
-msgid "A GtkSettings object to get settings from"
-msgstr "Un objècte GtkSettings d'ont obténer de paramètres"
-
-#: ../libyelp/yelp-settings.c:157
-msgid "GtkIconTheme"
-msgstr "GtkIconTheme"
-
-#: ../libyelp/yelp-settings.c:158
-msgid "A GtkIconTheme object to get icons from"
-msgstr "Un objècte GtkIconTheme d'ont obténer d'icònas"
-
-#: ../libyelp/yelp-settings.c:166
-msgid "Font Adjustment"
-msgstr "Ajustament de la poliça"
-
-#: ../libyelp/yelp-settings.c:167
-msgid "A size adjustment to add to font sizes"
-msgstr "Un ajustament de talha d'apondre a las talhas de poliça"
-
-#: ../libyelp/yelp-settings.c:175
-msgid "Show Text Cursor"
-msgstr "Afichar lo cursor de tèxte"
-
-#: ../libyelp/yelp-settings.c:176
-msgid "Show the text cursor or caret for accessible navigation"
-msgstr "Aficha lo cursor de tèxte o caret per una navigacion accessibla"
-
-#: ../libyelp/yelp-settings.c:184
-msgid "Editor Mode"
-msgstr "Mòde edicion"
-
-#: ../libyelp/yelp-settings.c:185
-msgid "Enable features useful to editors"
-msgstr "Activa las foncions utilas pels editors"
-
-#: ../libyelp/yelp-sqlite-storage.c:145
-msgid "Database filename"
-msgstr "Nom de fichièr de basa de donadas"
-
-#: ../libyelp/yelp-sqlite-storage.c:146
-msgid "The filename of the sqlite database"
-msgstr "Lo nom de fichièr de la basa de donadas sqlite"
-
-#: ../libyelp/yelp-transform.c:164
-msgid "XSLT Stylesheet"
-msgstr "Fuèlh d'estil XSLT"
-
-#: ../libyelp/yelp-transform.c:165
-msgid "The location of the XSLT stylesheet"
-msgstr "L'emplaçament del fuèlh d'estil XSLT"
-
-#: ../libyelp/yelp-transform.c:369 ../libyelp/yelp-transform.c:384
+#: libyelp/yelp-transform.c:371 libyelp/yelp-transform.c:386
#, c-format
msgid "The XSLT stylesheet ‘%s’ is either missing or not valid."
msgstr "Lo fuèlh d'estil « %s » es mancant o es pas valid."
-#: ../libyelp/yelp-transform.c:518
+#: libyelp/yelp-transform.c:520
msgid "No href attribute found on yelp:document\n"
msgstr "Cap d'atribut href pas trobat dins yelp:document\n"
-#: ../libyelp/yelp-transform.c:533
+#: libyelp/yelp-transform.c:535
msgid "Out of memory"
msgstr "Memòria insufisenta"
-#: ../libyelp/yelp-view.c:253
+#: libyelp/yelp-view.c:251
msgid "C_opy Code Block"
msgstr "C_opiar lo blòt de còdi"
-#: ../libyelp/yelp-view.c:258
+#: libyelp/yelp-view.c:256
msgid "_Copy Link Location"
msgstr "_Copiar l'emplaçament del ligam"
-#: ../libyelp/yelp-view.c:263
+#: libyelp/yelp-view.c:261
msgid "_Open Link"
msgstr "D_obrir lo ligam"
-#: ../libyelp/yelp-view.c:268
+#: libyelp/yelp-view.c:266
msgid "Open Link in New _Window"
msgstr "Dobrir lo ligam dins una fenèstra _novèla"
-#: ../libyelp/yelp-view.c:278
+#: libyelp/yelp-view.c:276
msgid "_Install Packages"
msgstr "_Installar los paquets"
-#: ../libyelp/yelp-view.c:283
+#: libyelp/yelp-view.c:281
msgid "Save Code _Block As…"
msgstr "Enregistrar lo _blòt de còdi jos…"
-#: ../libyelp/yelp-view.c:298
+#: libyelp/yelp-view.c:296
msgid "_Copy Text"
msgstr "_Copiar lo tèxte"
-#: ../libyelp/yelp-view.c:525
-msgid "Yelp URI"
-msgstr "URI de Yelp"
-
-#: ../libyelp/yelp-view.c:526
-msgid "A YelpUri with the current location"
-msgstr "Una YelpUri que conten l'emplaçament actual"
-
-#: ../libyelp/yelp-view.c:534
-msgid "Loading State"
-msgstr "Estat del cargament"
-
-#: ../libyelp/yelp-view.c:535
-msgid "The loading state of the view"
-msgstr "L'estat del cargament de l'afichatge"
-
-#: ../libyelp/yelp-view.c:544
-msgid "Page ID"
-msgstr "ID de pagina"
-
-#: ../libyelp/yelp-view.c:545
-msgid "The ID of the root page of the page being viewed"
-msgstr "L'ID de la pagina raiç de la pagina afichada actualament"
-
-#: ../libyelp/yelp-view.c:553
-msgid "Root Title"
-msgstr "Títol raiç"
-
-#: ../libyelp/yelp-view.c:554
-msgid "The title of the root page of the page being viewed"
-msgstr "Lo títol de la pagina raiç de la pagina afichada actualament"
-
-#: ../libyelp/yelp-view.c:562
-msgid "Page Title"
-msgstr "Títol de la pagina"
-
-#: ../libyelp/yelp-view.c:563
-msgid "The title of the page being viewed"
-msgstr "Lo títol de la pagina afichada actualament"
-
-#: ../libyelp/yelp-view.c:571
-msgid "Page Description"
-msgstr "Descripcion de la pagina"
-
-#: ../libyelp/yelp-view.c:572
-msgid "The description of the page being viewed"
-msgstr "La descripcion de la pagina afichada actualament"
-
-#: ../libyelp/yelp-view.c:580
-msgid "Page Icon"
-msgstr "Icòna de la pagina"
-
-#: ../libyelp/yelp-view.c:581
-msgid "The icon of the page being viewed"
-msgstr "L'icòna de la pagina afichada actualament"
-
-#: ../libyelp/yelp-view.c:826 ../libyelp/yelp-view.c:2198
+#: libyelp/yelp-view.c:828 libyelp/yelp-view.c:2161
#, c-format
msgid "The URI ‘%s’ does not point to a valid page."
msgstr "L'URI « %s » se referís pas a una pagina valida."
-#: ../libyelp/yelp-view.c:832 ../libyelp/yelp-view.c:2204
-#, c-format
+#: libyelp/yelp-view.c:834 libyelp/yelp-view.c:2167
msgid "The URI does not point to a valid page."
msgstr "L'URI se referís pas a una pagina valida."
-#: ../libyelp/yelp-view.c:837 ../libyelp/yelp-view.c:2210
+#: libyelp/yelp-view.c:839 libyelp/yelp-view.c:2173
#, c-format
msgid "The URI ‘%s’ could not be parsed."
msgstr "Impossible d'analisar l'URI « %s »."
-#: ../libyelp/yelp-view.c:842
-#, c-format
+#: libyelp/yelp-view.c:844
msgid "Unknown Error."
msgstr "Error desconeguda."
-#: ../libyelp/yelp-view.c:996
+#: libyelp/yelp-view.c:998
msgid "You do not have PackageKit. Package install links require PackageKit."
msgstr ""
"PackageKit es pas installat. Los ligams d'installacion de paquets necessitan "
"PackageKit."
-#: ../libyelp/yelp-view.c:1243
+#: libyelp/yelp-view.c:1245
msgid "Save Image"
msgstr "Enregistrar l'imatge"
-#: ../libyelp/yelp-view.c:1342
+#: libyelp/yelp-view.c:1344
msgid "Save Code"
msgstr "Enregistrar lo còdi"
-#: ../libyelp/yelp-view.c:1438
+#: libyelp/yelp-view.c:1440
#, c-format
msgid "Send email to %s"
msgstr "Mandar un corrièr electronic a %s"
-#: ../libyelp/yelp-view.c:1542
+#: libyelp/yelp-view.c:1544
msgid "_Save Image As…"
-msgstr "_Enregistrar l'imatge jos..."
+msgstr "_Enregistrar l'imatge jos…"
-#: ../libyelp/yelp-view.c:1543
+#: libyelp/yelp-view.c:1545
msgid "_Save Video As…"
msgstr "_Enregistrar la vidèo jos…"
-#: ../libyelp/yelp-view.c:1551
+#: libyelp/yelp-view.c:1553
msgid "S_end Image To…"
msgstr "Man_dar l'imatge a…"
-#: ../libyelp/yelp-view.c:1552
+#: libyelp/yelp-view.c:1554
msgid "S_end Video To…"
msgstr "Ma_ndar la vidèo a…"
-#: ../libyelp/yelp-view.c:1894
+#: libyelp/yelp-view.c:1895
#, c-format
msgid "Could not load a document for ‘%s’"
msgstr "Impossible de cargar un document per « %s »"
-#: ../libyelp/yelp-view.c:1900
-#, c-format
+#: libyelp/yelp-view.c:1901
msgid "Could not load a document"
msgstr "Impossible de cargar un document"
-#: ../libyelp/yelp-view.c:1984
+#: libyelp/yelp-view.c:1985
msgid "Document Not Found"
msgstr "Document pas trobat"
-#: ../libyelp/yelp-view.c:1986
+#: libyelp/yelp-view.c:1987
msgid "Page Not Found"
msgstr "Pagina pas trobada"
-#: ../libyelp/yelp-view.c:1989
+#: libyelp/yelp-view.c:1990
msgid "Cannot Read"
msgstr "Lectura impossibla"
-#: ../libyelp/yelp-view.c:1995
+#: libyelp/yelp-view.c:1996
msgid "Unknown Error"
msgstr "Error desconeguda"
-#: ../libyelp/yelp-view.c:2015
+#: libyelp/yelp-view.c:2016
msgid "Search for packages containing this document."
-msgstr ""
+msgstr "Cercar los paquets que contenon aqueste document."
-#: ../src/yelp-application.c:59
+#: src/yelp-application.c:59
msgid "Turn on editor mode"
msgstr "Bascular en mòde edicion"
-#: ../src/yelp-application.c:271 ../src/yelp-window.c:1180
-#: ../src/yelp-window.c:1188 ../yelp.desktop.in.in.h:1
+#: src/yelp-application.c:268 src/yelp-window.c:1208 src/yelp-window.c:1216
+#: yelp.desktop.in:3
msgid "Help"
msgstr "Ajuda"
-#: ../src/yelp-application.c:321
-msgid "New Window"
-msgstr "Fenèstra novèla"
-
-#: ../src/yelp-application.c:325
-msgid "Larger Text"
-msgstr "Agrandir lo tèxte"
-
-#: ../src/yelp-application.c:326
-msgid "Smaller Text"
-msgstr "Reduire lo tèxte"
-
-#: ../src/yelp-window.c:211
-msgid "Application"
-msgstr "Aplicacion"
-
-#: ../src/yelp-window.c:212
-msgid "A YelpApplication instance that controls this window"
-msgstr "Una instància de YelpApplication que contraròtla aquesta fenèstra"
-
-#: ../src/yelp-window.c:343
+#: src/yelp-window.c:361
msgid "Back"
msgstr "Precedent"
-#: ../src/yelp-window.c:350
+#: src/yelp-window.c:368
msgid "Forward"
msgstr "Seguent"
-#: ../src/yelp-window.c:361
+#: src/yelp-window.c:379
msgid "Menu"
msgstr "Menú"
-#: ../src/yelp-window.c:366
+#: src/yelp-window.c:384
+msgid "New Window"
+msgstr "Fenèstra novèla"
+
+#: src/yelp-window.c:385
msgid "Find…"
msgstr "Recercar…"
-#: ../src/yelp-window.c:367
+#: src/yelp-window.c:386
msgid "Print…"
msgstr "Imprimir…"
-#: ../src/yelp-window.c:372
+#: src/yelp-window.c:391
msgid "Previous Page"
msgstr "Pagina precedenta"
-#: ../src/yelp-window.c:373
+#: src/yelp-window.c:392
msgid "Next Page"
msgstr "Pagina seguenta"
-#: ../src/yelp-window.c:378
+#: src/yelp-window.c:397
+msgid "Larger Text"
+msgstr "Agrandir lo tèxte"
+
+#: src/yelp-window.c:398
+msgid "Smaller Text"
+msgstr "Reduire lo tèxte"
+
+#: src/yelp-window.c:403
msgid "All Help"
msgstr "Ajuda generala"
-#: ../src/yelp-window.c:400
+#: src/yelp-window.c:425
msgid "Search (Ctrl+S)"
msgstr "Recercar (Ctrl+S)"
-#: ../src/yelp-window.c:434
+#: src/yelp-window.c:442
+msgid "Bookmarks"
+msgstr "Marcapaginas"
+
+#: src/yelp-window.c:459
msgid "No bookmarks"
msgstr "Pas cap de marcapaginas"
-#: ../src/yelp-window.c:442
+#: src/yelp-window.c:467
msgid "Add Bookmark"
msgstr "Apondre un marcapaginas"
-#: ../src/yelp-window.c:448
+#: src/yelp-window.c:473
msgid "Remove Bookmark"
msgstr "Suprimir lo marcapaginas"
-#: ../yelp.desktop.in.in.h:2
+#: yelp.desktop.in:4
msgid "Get help with GNOME"
msgstr "Obténer d'ajuda a prepaus de GNOME"
-#: ../yelp.desktop.in.in.h:3
-msgid "documentation;information;manual;"
-msgstr "documentacion;informacion;manual;"
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: yelp.desktop.in:6
+msgid "documentation;information;manual;help;"
+msgstr "documentacion;informacion;manual;ajuda;"
+
+#~ msgid "Indexed"
+#~ msgstr "Indexat"
+
+#~ msgid "Whether the document content has been indexed"
+#~ msgstr "Indica se lo contengut del document es estat indexat o pas"
+
+#~ msgid "Document URI"
+#~ msgstr "URI del document"
+
+#~ msgid "The URI which identifies the document"
+#~ msgstr "L'URI qu'identifica lo document"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
+#~ msgid "A YelpView instance to control"
+#~ msgstr "Una instància YelpView de contrarotlar"
+
+#~ msgid "A YelpBookmarks implementation instance"
+#~ msgstr "Una instància d'implementacion de YelpBookmarks"
+
+#~ msgid "GtkSettings"
+#~ msgstr "GtkSettings"
+
+#~ msgid "A GtkSettings object to get settings from"
+#~ msgstr "Un objècte GtkSettings d'ont obténer de paramètres"
+
+#~ msgid "GtkIconTheme"
+#~ msgstr "GtkIconTheme"
+
+#~ msgid "A GtkIconTheme object to get icons from"
+#~ msgstr "Un objècte GtkIconTheme d'ont obténer d'icònas"
+
+#~ msgid "Font Adjustment"
+#~ msgstr "Ajustament de la poliça"
+
+#~ msgid "A size adjustment to add to font sizes"
+#~ msgstr "Un ajustament de talha d'apondre a las talhas de poliça"
+
+#~ msgid "Show Text Cursor"
+#~ msgstr "Afichar lo cursor de tèxte"
+
+#~ msgid "Show the text cursor or caret for accessible navigation"
+#~ msgstr "Aficha lo cursor de tèxte o caret per una navigacion accessibla"
+
+#~ msgid "Editor Mode"
+#~ msgstr "Mòde edicion"
+
+#~ msgid "Enable features useful to editors"
+#~ msgstr "Activa las foncions utilas pels editors"
+
+#~ msgid "Database filename"
+#~ msgstr "Nom de fichièr de basa de donadas"
+
+#~ msgid "The filename of the sqlite database"
+#~ msgstr "Lo nom de fichièr de la basa de donadas sqlite"
+
+#~ msgid "XSLT Stylesheet"
+#~ msgstr "Fuèlh d'estil XSLT"
+
+#~ msgid "The location of the XSLT stylesheet"
+#~ msgstr "L'emplaçament del fuèlh d'estil XSLT"
+
+#~ msgid "Yelp URI"
+#~ msgstr "URI de Yelp"
+
+#~ msgid "A YelpUri with the current location"
+#~ msgstr "Una YelpUri que conten l'emplaçament actual"
+
+#~ msgid "Loading State"
+#~ msgstr "Estat del cargament"
+
+#~ msgid "The loading state of the view"
+#~ msgstr "L'estat del cargament de l'afichatge"
+
+#~ msgid "Page ID"
+#~ msgstr "ID de pagina"
+
+#~ msgid "The ID of the root page of the page being viewed"
+#~ msgstr "L'ID de la pagina raiç de la pagina afichada actualament"
+
+#~ msgid "Root Title"
+#~ msgstr "Títol raiç"
+
+#~ msgid "The title of the root page of the page being viewed"
+#~ msgstr "Lo títol de la pagina raiç de la pagina afichada actualament"
+
+#~ msgid "Page Title"
+#~ msgstr "Títol de la pagina"
+
+#~ msgid "The title of the page being viewed"
+#~ msgstr "Lo títol de la pagina afichada actualament"
+
+#~ msgid "Page Description"
+#~ msgstr "Descripcion de la pagina"
+
+#~ msgid "The description of the page being viewed"
+#~ msgstr "La descripcion de la pagina afichada actualament"
+
+#~ msgid "Page Icon"
+#~ msgstr "Icòna de la pagina"
+
+#~ msgid "The icon of the page being viewed"
+#~ msgstr "L'icòna de la pagina afichada actualament"
+
+#~ msgid "Application"
+#~ msgstr "Aplicacion"
+
+#~ msgid "A YelpApplication instance that controls this window"
+#~ msgstr "Una instància de YelpApplication que contraròtla aquesta fenèstra"
#~ msgid "See all search results for “%s”"
#~ msgstr "Veire totes los resultats de recèrca per « %s »"