Hello community, here is the log from the commit of package epiphany for openSUSE:Factory checked in at 2015-06-30 10:18:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany (Old) and /work/SRC/openSUSE:Factory/.epiphany.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "epiphany" Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany/epiphany.changes 2015-05-18 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.epiphany.new/epiphany.changes 2015-06-30 10:18:35.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 27 13:02:39 UTC 2015 - [email protected] + +- Update to version 3.16.2: + + Fix regressions in the form filler (bgo#750842). + + Other code fixes and minor improvements. + + Updated translations. + +------------------------------------------------------------------- Old: ---- epiphany-3.16.1.tar.xz New: ---- epiphany-3.16.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany.spec ++++++ --- /var/tmp/diff_new_pack.kQmiZD/_old 2015-06-30 10:18:36.000000000 +0200 +++ /var/tmp/diff_new_pack.kQmiZD/_new 2015-06-30 10:18:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: epiphany -Version: 3.16.1 +Version: 3.16.2 Release: 0 %define _base_version 3.16 Summary: GNOME Web Browser ++++++ epiphany-3.16.1.tar.xz -> epiphany-3.16.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/ChangeLog new/epiphany-3.16.2/ChangeLog --- old/epiphany-3.16.1/ChangeLog 2015-05-12 15:17:13.000000000 +0200 +++ new/epiphany-3.16.2/ChangeLog 2015-06-23 16:28:51.000000000 +0200 @@ -1,3 +1,89 @@ +commit dc4db9278bdcd2a6a951bce14fa3454cb7907788 +Author: Claudio Saavedra <[email protected]> +Date: Tue Jun 23 17:27:55 2015 +0300 + + [release] 3.16.2 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 5bbb4bd994fab4d7b9083907e4b5f8335dcfb2b9 +Author: Claudio Saavedra <[email protected]> +Date: Fri Jun 12 15:10:59 2015 +0300 + + web-extension: fix color of form filler popup + + Style context calls were missing setting the state previously + as required by GtkStyleContext. + + https://bugzilla.gnome.org/show_bug.cgi?id=750842 + + embed/web-extension/ephy-web-extension.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 643b0da823577fc41ea00163b3fe30635db7886c +Author: Claudio Saavedra <[email protected]> +Date: Fri Jun 12 14:26:15 2015 +0300 + + web-extension: use proper number format for position dom properties + + DOM bindings use double, not long. This fixes the form filler + popup not showing up. Use the proper DOM bindings API instead + of g_object_get() to avoid this happening again. + + https://bugzilla.gnome.org/show_bug.cgi?id=750842 + + embed/web-extension/ephy-web-extension.c | 11 ++++++----- + lib/ephy-web-dom-utils.c | 26 +++++++++++--------------- + lib/ephy-web-dom-utils.h | 9 +++++---- + 3 files changed, 22 insertions(+), 24 deletions(-) + +commit 2196b1b306aab96255ba2414619be6b106340668 +Author: Claudio Saavedra <[email protected]> +Date: Tue Jun 16 13:38:17 2015 +0300 + + web-extension: plug leaked string + + embed/web-extension/ephy-web-extension.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ad6a013a8cae56597254a7581a4120434a2d3f3b +Author: Benjamin Steinwender <[email protected]> +Date: Sat Jun 20 06:30:22 2015 +0000 + + Updated German translation + + help/de/de.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 43dd857bdda51113a357cde89556e157d61003b2 +Author: Akom Chotiphantawanon <[email protected]> +Date: Fri May 22 16:25:01 2015 +0700 + + Updated Thai translation + + po/th.po | 344 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 187 insertions(+), 157 deletions(-) + +commit 4d765786766630ad2190f95324a6c485de84268d +Author: Jordi Mas <[email protected]> +Date: Thu May 21 22:00:08 2015 +0200 + + Fixes to Catalan translation + + po/ca.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 6c43baa5d0c4651bd317c14dfa9bec9229861e47 +Author: Kalev Lember <[email protected]> +Date: Tue May 12 16:14:21 2015 +0200 + + Fix a syntax error in Esperanto translation + + po/eo.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 6f0f6ed4adee3410af39243d4d36e8ae039c9f00 Author: Claudio Saavedra <[email protected]> Date: Tue May 12 16:16:23 2015 +0300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/NEWS new/epiphany-3.16.2/NEWS --- old/epiphany-3.16.1/NEWS 2015-05-12 15:13:27.000000000 +0200 +++ new/epiphany-3.16.2/NEWS 2015-06-23 16:27:33.000000000 +0200 @@ -1,4 +1,12 @@ =============== +Epiphany 3.16.2 +=============== + + - Fix regressions in the form filler (#750842) + - Other code fixes and minor improvements. + - Updated translations. + +=============== Epiphany 3.16.1 =============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/configure new/epiphany-3.16.2/configure --- old/epiphany-3.16.1/configure 2015-05-12 15:14:33.000000000 +0200 +++ new/epiphany-3.16.2/configure 2015-06-23 16:28:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNOME Web Browser 3.16.1. +# Generated by GNU Autoconf 2.69 for GNOME Web Browser 3.16.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Web Browser' PACKAGE_TARNAME='epiphany' -PACKAGE_VERSION='3.16.1' -PACKAGE_STRING='GNOME Web Browser 3.16.1' +PACKAGE_VERSION='3.16.2' +PACKAGE_STRING='GNOME Web Browser 3.16.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany' PACKAGE_URL='' @@ -1428,7 +1428,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Web Browser 3.16.1 to adapt to many kinds of systems. +\`configure' configures GNOME Web Browser 3.16.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1498,7 +1498,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Web Browser 3.16.1:";; + short | recursive ) echo "Configuration of GNOME Web Browser 3.16.2:";; esac cat <<\_ACEOF @@ -1636,7 +1636,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Web Browser configure 3.16.1 +GNOME Web Browser configure 3.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2059,7 +2059,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Web Browser $as_me 3.16.1, which was +It was created by GNOME Web Browser $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2426,7 +2426,7 @@ EPIPHANY_MINOR_VERSION=16 -EPIPHANY_MICRO_VERSION=1 +EPIPHANY_MICRO_VERSION=2 am__api_version='1.14' @@ -2944,7 +2944,7 @@ # Define the identity of the package. PACKAGE='epiphany' - VERSION='3.16.1' + VERSION='3.16.2' cat >>confdefs.h <<_ACEOF @@ -16861,7 +16861,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Web Browser $as_me 3.16.1, which was +This file was extended by GNOME Web Browser $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16927,7 +16927,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Web Browser config.status 3.16.1 +GNOME Web Browser config.status 3.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/configure.ac new/epiphany-3.16.2/configure.ac --- old/epiphany-3.16.1/configure.ac 2015-05-12 15:12:23.000000000 +0200 +++ new/epiphany-3.16.2/configure.ac 2015-06-23 16:27:41.000000000 +0200 @@ -17,7 +17,7 @@ m4_define([epiphany_version_major],[3]) m4_define([epiphany_version_minor],[16]) -m4_define([epiphany_version_micro],[1]) +m4_define([epiphany_version_micro],[2]) m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro]) AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/embed/web-extension/ephy-web-extension.c new/epiphany-3.16.2/embed/web-extension/ephy-web-extension.c --- old/epiphany-3.16.1/embed/web-extension/ephy-web-extension.c 2015-04-08 16:28:12.000000000 +0200 +++ new/epiphany-3.16.2/embed/web-extension/ephy-web-extension.c 2015-06-23 15:04:49.000000000 +0200 @@ -513,6 +513,8 @@ get_selected_bgcolor (void) { GdkRGBA color; + gtk_style_context_set_state (get_entry_style_context (), + GTK_STATE_FLAG_SELECTED); gtk_style_context_get_background_color (get_entry_style_context (), GTK_STATE_FLAG_SELECTED, &color); @@ -523,6 +525,8 @@ get_selected_fgcolor (void) { GdkRGBA color; + gtk_style_context_set_state (get_entry_style_context (), + GTK_STATE_FLAG_SELECTED); gtk_style_context_get_color (get_entry_style_context (), GTK_STATE_FLAG_SELECTED, &color); @@ -533,6 +537,8 @@ get_bgcolor (void) { GdkRGBA color; + gtk_style_context_set_state (get_entry_style_context (), + GTK_STATE_FLAG_NORMAL); gtk_style_context_get_background_color (get_entry_style_context (), GTK_STATE_FLAG_NORMAL, &color); @@ -543,6 +549,8 @@ get_fgcolor (void) { GdkRGBA color; + gtk_style_context_set_state (get_entry_style_context (), + GTK_STATE_FLAG_NORMAL); gtk_style_context_get_color (get_entry_style_context (), GTK_STATE_FLAG_NORMAL, &color); @@ -598,16 +606,17 @@ GSList *iter; GSList *auth_data_list; gboolean username_node_ever_edited; - long x, y; - long input_width; + double x, y; + double input_width; char *style_attribute; - const char* username; + char* username; g_object_get (username_node, "value", &username, - "offset-width", &input_width, NULL); + input_width = webkit_dom_element_get_offset_width (WEBKIT_DOM_ELEMENT (username_node)); + main_div = webkit_dom_document_create_element (document, "div", NULL); webkit_dom_element_set_attribute (main_div, "id", "ephy-user-choices-container", NULL); @@ -618,13 +627,13 @@ */ style_attribute = g_strdup_printf ("position: absolute; z-index: 2147483647;" "cursor: default;" - "width: %ldpx;" + "width: %lfpx;" "background-color: white;" "box-shadow: 5px 5px 5px black;" "border-top: 0;" "border-radius: 8px;" "-webkit-user-modify: read-only ! important;" - "left: %ldpx; top: %ldpx;", + "left: %lfpx; top: %lfpx;", input_width, x, y); webkit_dom_element_set_attribute (main_div, "style", style_attribute, NULL); @@ -700,6 +709,7 @@ NULL); } + g_free (username); body = WEBKIT_DOM_NODE (webkit_dom_document_get_body (document)); webkit_dom_node_append_child (WEBKIT_DOM_NODE (body), WEBKIT_DOM_NODE (main_div), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/help/de/de.po new/epiphany-3.16.2/help/de/de.po --- old/epiphany-3.16.1/help/de/de.po 2015-04-08 16:28:12.000000000 +0200 +++ new/epiphany-3.16.2/help/de/de.po 2015-06-23 14:02:09.000000000 +0200 @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: epiphany master\n" -"POT-Creation-Date: 2015-03-10 18:09+0000\n" -"PO-Revision-Date: 2015-03-10 21:12+0100\n" -"Last-Translator: Christian Kirbach <[email protected]>\n" +"POT-Creation-Date: 2015-06-20 03:41+0000\n" +"PO-Revision-Date: 2015-06-20 08:29+0100\n" +"Last-Translator: Benjamin Steinwender <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\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.7.4\n" +"X-Generator: Poedit 1.7.5\n" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" @@ -1698,7 +1698,7 @@ #. (itstool) path: info/desc #: C/pref-do-not-track.page:24 -msgid "How do I tell websites that I do not want them to monitor my online activites?" +msgid "How do I tell websites that I do not want them to monitor my online activities?" msgstr "Wie gebe ich Internet-Seiten bekannt, dass diese nicht meine Aktivitäten überwachen sollen?" #. (itstool) path: page/title diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/help/de/pref-do-not-track.page new/epiphany-3.16.2/help/de/pref-do-not-track.page --- old/epiphany-3.16.1/help/de/pref-do-not-track.page 2015-04-08 16:28:32.000000000 +0200 +++ new/epiphany-3.16.2/help/de/pref-do-not-track.page 2015-06-23 14:02:30.000000000 +0200 @@ -19,8 +19,7 @@ <include xmlns="http://www.w3.org/2001/XInclude"; href="legal.xml"/> - <desc>How do I tell websites that I do not want them to monitor my online - activities?</desc> + <desc>Wie gebe ich Internet-Seiten bekannt, dass diese nicht meine Aktivitäten überwachen sollen?</desc> <mal:credit xmlns:mal="http://projectmallard.org/1.0/"; type="translator copyright"> <mal:name>Christian Kirbach</mal:name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/lib/ephy-web-dom-utils.c new/epiphany-3.16.2/lib/ephy-web-dom-utils.c --- old/epiphany-3.16.1/lib/ephy-web-dom-utils.c 2015-04-08 16:28:12.000000000 +0200 +++ new/epiphany-3.16.2/lib/ephy-web-dom-utils.c 2015-06-23 14:38:16.000000000 +0200 @@ -442,18 +442,16 @@ **/ void ephy_web_dom_utils_get_absolute_position_for_element (WebKitDOMElement *element, - glong *x, - glong *y) + double *x, + double *y) { WebKitDOMElement *parent; - long offset_top, offset_left; - long parent_x, parent_y; + double offset_top, offset_left; + double parent_x, parent_y; - g_object_get (element, - "offset-left", &offset_left, - "offset-top", &offset_top, - "offset-parent", &parent, - NULL); + offset_top = webkit_dom_element_get_offset_top (element); + offset_left = webkit_dom_element_get_offset_left (element); + parent = webkit_dom_element_get_offset_parent (element); *x = offset_left; *y = offset_top; @@ -479,16 +477,14 @@ **/ void ephy_web_dom_utils_get_absolute_bottom_for_element (WebKitDOMElement *element, - long *x, - long *y) + double *x, + double *y) { - long offset_height; + double offset_height; ephy_web_dom_utils_get_absolute_position_for_element (element, x, y); - g_object_get (element, - "offset-height", &offset_height, - NULL); + offset_height = webkit_dom_element_get_offset_height (element); *y += offset_height; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/lib/ephy-web-dom-utils.h new/epiphany-3.16.2/lib/ephy-web-dom-utils.h --- old/epiphany-3.16.1/lib/ephy-web-dom-utils.h 2015-04-08 16:28:12.000000000 +0200 +++ new/epiphany-3.16.2/lib/ephy-web-dom-utils.h 2015-06-23 14:46:39.000000000 +0200 @@ -42,12 +42,13 @@ WebKitDOMNode **password); void ephy_web_dom_utils_get_absolute_bottom_for_element (WebKitDOMElement *element, - long *x, - long *y); + double *x, + double *y); void ephy_web_dom_utils_get_absolute_position_for_element(WebKitDOMElement *element, - long *x, - long *y); + double *x, + double *y); + G_END_DECLS #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/po/ca.po new/epiphany-3.16.2/po/ca.po --- old/epiphany-3.16.1/po/ca.po 2015-04-25 11:40:44.000000000 +0200 +++ new/epiphany-3.16.2/po/ca.po 2015-06-02 10:55:15.000000000 +0200 @@ -167,7 +167,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:20 msgid "Whether to store and prefill passwords in websites." -msgstr "Si es desen i es s'emplenen les contrasenyes als llocs web." +msgstr "Si es desen i s'emplenen les contrasenyes als llocs web." #: ../data/org.gnome.epiphany.gschema.xml.h:21 msgid "Automatically manage offline status with NetworkManager" @@ -496,7 +496,7 @@ #: ../embed/ephy-about-handler.c:143 msgid "Plugins are disabled in the preferences" -msgstr "El connectors estan inhabilitats a les preferències" +msgstr "Els connectors estan inhabilitats a les preferències" #: ../embed/ephy-about-handler.c:156 msgid "Enabled" @@ -2725,7 +2725,7 @@ #: ../src/popup-commands.c:243 msgid "Save Media As" -msgstr "Anomena i desa el media" +msgstr "Anomena i desa el medi" #. Translators: the first %s is the language name, and the #. * second %s is the locale name. Example: @@ -2817,7 +2817,7 @@ #: ../src/window-commands.c:755 #, c-format msgid "The application '%s' is ready to be used" -msgstr "L'aplicació «%s» ja és a punt per fer-se servir" +msgstr "L'aplicació «%s» ja està a punt per fer-se servir" #: ../src/window-commands.c:758 #, c-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/po/eo.po new/epiphany-3.16.2/po/eo.po --- old/epiphany-3.16.1/po/eo.po 2015-04-25 11:40:44.000000000 +0200 +++ new/epiphany-3.16.2/po/eo.po 2015-06-02 10:55:15.000000000 +0200 @@ -94,7 +94,7 @@ #: ../data/epiphany.desktop.in.in.h:5 msgid "web;browser;internet;" -msgstr "reto;foliumilo;interreto" +msgstr "reto;foliumilo;interreto;" #: ../data/epiphany.desktop.in.in.h:6 #| msgid "New _Incognito Window" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/po/th.po new/epiphany-3.16.2/po/th.po --- old/epiphany-3.16.1/po/th.po 2015-04-08 16:28:12.000000000 +0200 +++ new/epiphany-3.16.2/po/th.po 2015-06-02 10:55:15.000000000 +0200 @@ -1,17 +1,17 @@ # Thai translation for epiphany. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This file is distributed under the same license as the epiphany package. # Isriya Paireepairit <[email protected]>, 2004. # Theppitak Karoonboonyanan <[email protected]>, 2005-2012. -# Akom Chotiphantawanon <[email protected]>, 2014. +# Akom Chotiphantawanon <[email protected]>, 2014-2015. # msgid "" msgstr "" "Project-Id-Version: epiphany.th\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-12-01 16:53+0000\n" -"PO-Revision-Date: 2014-12-08 14:27+0700\n" +"POT-Creation-Date: 2015-04-25 03:42+0000\n" +"PO-Revision-Date: 2015-05-22 16:19+0700\n" "Last-Translator: Akom Chotiphantawanon <[email protected]>\n" "Language-Team: Thai <[email protected]>\n" "Language: th\n" @@ -19,6 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -73,7 +74,7 @@ #: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 msgid "Web" msgstr "เว็บ" @@ -93,6 +94,10 @@ msgid "web;browser;internet;" msgstr "เว็บ;เบราว์เซอร์;อินเทอร์เน็ต;" +#: ../data/epiphany.desktop.in.in.h:6 +msgid "New Incognito Window" +msgstr "หน้าต่างใหม่ไม่เปิดเผยตัว" + #: ../data/org.gnome.epiphany.gschema.xml.h:1 msgid "Browse with caret" msgstr "ดูเว็บโดยมีเคอร์เซอร์" @@ -344,39 +349,31 @@ msgstr "รหัสอักขระปริยาย ใช้ได้เฉพาะค่าที่ WebKitGTK+ รู้จักเท่านั้น" #: ../data/org.gnome.epiphany.gschema.xml.h:57 -msgid "Size of disk cache" -msgstr "เนื้อที่ของแคชบนดิสก์" - -#: ../data/org.gnome.epiphany.gschema.xml.h:58 -msgid "Size of disk cache, in MB." -msgstr "เนื้อที่ของแคชบนดิสก์ เป็น MB" - -#: ../data/org.gnome.epiphany.gschema.xml.h:59 -#: ../src/resources/prefs-dialog.ui.h:40 +#: ../src/resources/prefs-dialog.ui.h:39 msgid "Languages" msgstr "ภาษา" -#: ../data/org.gnome.epiphany.gschema.xml.h:60 +#: ../data/org.gnome.epiphany.gschema.xml.h:58 msgid "Preferred languages, two letter codes." msgstr "ภาษาที่เลือก (รหัสอักษรสองตัว)" -#: ../data/org.gnome.epiphany.gschema.xml.h:61 +#: ../data/org.gnome.epiphany.gschema.xml.h:59 msgid "Cookie accept" msgstr "การยอมรับคุกกี้" -#: ../data/org.gnome.epiphany.gschema.xml.h:62 +#: ../data/org.gnome.epiphany.gschema.xml.h:60 msgid "" -"Where to accept cookies from. Possible values are \"anywhere\", \"current " -"site\" and \"nowhere\"." +"Where to accept cookies from. Possible values are \"always\", \"no-third-" +"party\" and \"never\"." msgstr "" -"จะรับคุกกี้จากแหล่งไหน ค่าที่เป็นไปได้คือ \"anywhere\" (ทุกแหล่ง), \"current site" -"\" (ไซต์ปัจจุบัน) และ \"nowhere\" (ไม่รับ)" +"จะรับคุกกี้จากแหล่งไหน ค่าที่เป็นไปได้คือ \"always\" (รับเสมอ), \"no-third-party" +"\" (ไม่รับบุคคลที่สาม) และ \"never\" (ไม่รับเลย)" -#: ../data/org.gnome.epiphany.gschema.xml.h:63 +#: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" msgstr "โหมดของภาพเคลื่อนไหว" -#: ../data/org.gnome.epiphany.gschema.xml.h:64 +#: ../data/org.gnome.epiphany.gschema.xml.h:62 msgid "" "How to present animated images. Possible values are \"normal\", \"once\" and " "\"disabled\"." @@ -384,44 +381,44 @@ "จะแสดงภาพเคลื่อนไหวอย่างไร ค่าที่เป็นไปได้คือ \"normal\" (ปกติ), \"once\" (รอบเดียว) " "และ \"disabled\" (ปิด)" -#: ../data/org.gnome.epiphany.gschema.xml.h:65 +#: ../data/org.gnome.epiphany.gschema.xml.h:63 msgid "Allow popups" msgstr "อนุญาตให้ผุดหน้าต่าง" -#: ../data/org.gnome.epiphany.gschema.xml.h:66 +#: ../data/org.gnome.epiphany.gschema.xml.h:64 msgid "" "Allow sites to open new windows using JavaScript (if JavaScript is enabled)." msgstr "อนุญาตให้เว็บไซต์เปิดหน้าต่างใหม่ด้วยจาวาสคริปต์ (ถ้าเปิดใช้จาวาสคริปต์)" -#: ../data/org.gnome.epiphany.gschema.xml.h:67 +#: ../data/org.gnome.epiphany.gschema.xml.h:65 msgid "Enable Plugins" msgstr "เปิดใช้ปลั๊กอิน" -#: ../data/org.gnome.epiphany.gschema.xml.h:68 +#: ../data/org.gnome.epiphany.gschema.xml.h:66 msgid "Enable JavaScript" msgstr "ใช้จาวาสคริปต์" -#: ../data/org.gnome.epiphany.gschema.xml.h:69 +#: ../data/org.gnome.epiphany.gschema.xml.h:67 msgid "Enable WebGL" msgstr "เปิดใช้ WebGL" -#: ../data/org.gnome.epiphany.gschema.xml.h:70 +#: ../data/org.gnome.epiphany.gschema.xml.h:68 msgid "Whether to enable support for WebGL contexts." msgstr "กำหนดว่าจะเปิดใช้การรองรับ WebGL หรือไม่" -#: ../data/org.gnome.epiphany.gschema.xml.h:71 +#: ../data/org.gnome.epiphany.gschema.xml.h:69 msgid "Enable WebAudio" msgstr "เปิดใช้ WebAudio" -#: ../data/org.gnome.epiphany.gschema.xml.h:72 +#: ../data/org.gnome.epiphany.gschema.xml.h:70 msgid "Whether to enable support for WebAudio." msgstr "กำหนดว่าจะเปิดใช้การรองรับ WebAudio หรือไม่" -#: ../data/org.gnome.epiphany.gschema.xml.h:73 +#: ../data/org.gnome.epiphany.gschema.xml.h:71 msgid "Do Not Track" msgstr "ไม่ต้องติดตามการเชื่อมต่อ" -#: ../data/org.gnome.epiphany.gschema.xml.h:74 +#: ../data/org.gnome.epiphany.gschema.xml.h:72 msgid "" "Whether to tell websites that we do not wish to be tracked. Please note that " "web pages are not forced to follow this setting." @@ -429,21 +426,21 @@ "กำหนดว่าจะแจ้งเว็บไซต์ว่าเราไม่ต้องการถูกติดตามการเชื่อมต่อหรือไม่ พึงระลึกว่าเว็บต่างๆ " "ไม่จำเป็นต้องทำตามค่าตั้งนี้" -#: ../data/org.gnome.epiphany.gschema.xml.h:75 +#: ../data/org.gnome.epiphany.gschema.xml.h:73 msgid "Enable Adblock" msgstr "เปิดใช้ Adblock" -#: ../data/org.gnome.epiphany.gschema.xml.h:76 +#: ../data/org.gnome.epiphany.gschema.xml.h:74 msgid "" "Whether to block the embedded advertisements that web pages might want to " "show." msgstr "กำหนดว่าจะปิดกั้นโฆษณาที่ฝังอยู่ในหน้าเว็บต่างๆ หรือไม่" -#: ../data/org.gnome.epiphany.gschema.xml.h:77 +#: ../data/org.gnome.epiphany.gschema.xml.h:75 msgid "The downloads folder" msgstr "โฟลเดอร์เก็บแฟ้มดาวน์โหลด" -#: ../data/org.gnome.epiphany.gschema.xml.h:78 +#: ../data/org.gnome.epiphany.gschema.xml.h:76 msgid "" "The path of the folder where to download files to; or \"Downloads\" to use " "the default downloads folder, or \"Desktop\" to use the desktop folder." @@ -451,11 +448,11 @@ "พาธของโฟลเดอร์ที่จะเก็บแฟ้มดาวน์โหลด หรือใช้ค่า \"Downloads\" " "เพื่อใช้โฟลเดอร์ดาวน์โหลดปริยาย หรือ \"Desktop\" เพื่อเก็บลงบนพื้นโต๊ะ" -#: ../data/org.gnome.epiphany.gschema.xml.h:79 +#: ../data/org.gnome.epiphany.gschema.xml.h:77 msgid "Whether to show the title column in the bookmarks window." msgstr "กำหนดว่าจะแสดงคอลัมน์หัวเรื่องในหน้าต่างที่คั่นหน้าหรือไม่" -#: ../data/org.gnome.epiphany.gschema.xml.h:80 +#: ../data/org.gnome.epiphany.gschema.xml.h:78 msgid "Whether to show the address column in the bookmarks window." msgstr "กำหนดว่าจะแสดงคอลัมน์ที่อยู่เว็บในหน้าต่างที่คั่นหน้าหรือไม่" @@ -550,11 +547,18 @@ #: ../embed/ephy-about-handler.c:555 msgid "" -"Incognito mode will not hide your activity from your employer, your Internet " -"Service Provider, your government, or the websites that you visit." +"Incognito mode hides your activity only from people using this computer." +msgstr "โหมดไม่เผยตัวจะซ่อนกิจกรรมของคุณจากบุคคลที่ใช้คอมพิวเตอร์นี้เท่านั้น" + +#: ../embed/ephy-about-handler.c:557 +msgid "" +"It will not hide your activity from your employer if you are at work. Your " +"internet service provider, your government, other governments, the websites " +"that you visit, and advertisers on these websites may still be tracking you." msgstr "" -"โหมดไม่เปิดเผยตัวจะไม่ได้ซ่อนกิจกรรมของคุณจากนายจ้างของคุณ, ผู้ให้บริการอินเทอร์เน็ตของคุณ, " -"รัฐบาลของคุณ, หรือเว็บไซต์ที่คุณเข้าเยี่ยมชม" +"แต่จะไม่ได้ซ่อนกิจกรรมของคุณจากนายจ้างของคุณถ้าคุณอยู่ที่ทำงาน ผู้ให้บริการอินเทอร์เน็ตของคุณ, " +"รัฐบาลของคุณ, รัฐบาลประเทศอื่น, เว็บไซต์ที่คุณเข้าเยี่ยมชม, " +"และผู้ลงโฆษณาในเว็บไซต์เหล่านี้อาจจะยังติดตามคุณอยู่" #. characters #: ../embed/ephy-embed.c:51 @@ -924,9 +928,13 @@ msgid "Find next occurrence of the search string" msgstr "หาข้อความเดิมต่อไป" -#: ../embed/ephy-web-view.c:492 ../src/window-commands.c:330 -msgid "Save" -msgstr "บันทึก" +#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_บันทึก" + +#: ../embed/ephy-web-view.c:493 +msgid "_Don’t Save" +msgstr "ไ_ม่บันทึก" #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. @@ -936,37 +944,44 @@ msgid "Do you want to save your password for “%s”?" msgstr "คุณต้องการบันทึกรหัสผ่านของคุณสำหรับ “%s” หรือไม่?" -#: ../embed/ephy-web-view.c:1415 +#: ../embed/ephy-web-view.c:1416 msgid "Deny" msgstr "ปฏิเสธ" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1417 msgid "Allow" msgstr "อนุญาต" -#: ../embed/ephy-web-view.c:1426 +#. Translators: Geolocation policy for a specific site. +#: ../embed/ephy-web-view.c:1429 #, c-format msgid "The page at <b>%s</b> wants to know your location." msgstr "หน้าเว็บ <b>%s</b> ต้องการทราบพิกัดตำแหน่งของคุณ" +#. Translators: Notification policy for a specific site. +#: ../embed/ephy-web-view.c:1433 +#, c-format +msgid "The page at <b>%s</b> wants to show desktop notifications." +msgstr "หน้าเว็บ <b>%s</b> ต้องการแสดงการแจ้งเหตุบนเดสก์ท็อป" + #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1510 +#: ../embed/ephy-web-view.c:1519 #, c-format msgid "Loading “%s”…" msgstr "กำลังเรียก “%s”…" -#: ../embed/ephy-web-view.c:1512 +#: ../embed/ephy-web-view.c:1521 msgid "Loading…" msgstr "กำลังเรียก…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1734 +#: ../embed/ephy-web-view.c:1743 msgid "" "This website presented identification that belongs to a different website." msgstr "เว็บไซต์นี้แสดงการระบุตัวตนที่เป็นของเว็บไซต์ที่ต่างออกไป" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1739 +#: ../embed/ephy-web-view.c:1748 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -974,32 +989,32 @@ "การระบุตัวตนของเว็บไซต์นี้เก่าเกินกว่าจะเชื่อถือได้ กรุณาตรวจสอบวันที่ในปฏิทินของคอมพิวเตอร์ของคุณ" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1744 +#: ../embed/ephy-web-view.c:1753 msgid "This website’s identification was not issued by a trusted organization." msgstr "การระบุตัวตนของเว็บไซต์นี้ไม่ได้ออกโดยองค์กรที่เชื่อถือได้" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1749 +#: ../embed/ephy-web-view.c:1758 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "การระบุตัวตนของเว็บไซต์นี้ไม่สามารถประมวลผลได้ ข้อมูลตัวตนอาจจะเสียหาย" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1754 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." msgstr "การระบุตัวตนของเว็บไซต์นี้ได้ถูกเพิกถอนโดยองค์กรที่เชื่อถือได้" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1759 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "การระบุตัวตนของเว็บไซต์นี้ไม่อาจเชื่อถือได้ เพราะใช้วิธีเข้ารหัสลับที่หละหลวมมาก" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1764 +#: ../embed/ephy-web-view.c:1773 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1008,13 +1023,13 @@ "กรุณาตรวจสอบวันที่ในปฏิทินของคอมพิวเตอร์ของคุณ" #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1800 +#: ../embed/ephy-web-view.c:1809 #, c-format msgid "This might not be the real %s." msgstr "นี่อาจไม่ใช่ %s ที่แท้จริง" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1805 +#: ../embed/ephy-web-view.c:1814 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1025,7 +1040,7 @@ "มีบางอย่างผิดปกติเกี่ยวกับการระบุตัวตนของเว็บไซต์นี้:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1811 +#: ../embed/ephy-web-view.c:1820 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1035,27 +1050,27 @@ "คุณควรจะเชื่อมต่อต่อไปก็ต่อเมื่อคุณรู้ว่ามีเหตุผลที่ดีที่เว็บไซต์นี้ไม่ได้ใช้การระบุตัวตนที่เชื่อถือได้เท่านั้น" #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1815 +#: ../embed/ephy-web-view.c:1824 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "ธนาคาร ร้านค้า และเว็บไซต์สาธารณะอื่นๆ ที่ถูกต้องตามกฎหมายจะไม่ขอให้คุณทำเช่นนี้" -#: ../embed/ephy-web-view.c:1856 +#: ../embed/ephy-web-view.c:1865 msgid "None specified" msgstr "ไม่ระบุ" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1869 ../embed/ephy-web-view.c:1884 -#: ../embed/ephy-web-view.c:1904 +#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 +#: ../embed/ephy-web-view.c:1913 #, c-format msgid "Problem loading “%s”" msgstr "เกิดปัญหาขณะเรียก “%s”" -#: ../embed/ephy-web-view.c:1871 +#: ../embed/ephy-web-view.c:1880 msgid "Oops! Unable to display this website." msgstr "โอ๊ะ! ไม่สามารถแสดงเว็บไซต์นี้ได้" -#: ../embed/ephy-web-view.c:1872 +#: ../embed/ephy-web-view.c:1881 #, c-format msgid "" "<p>The site at “%s” seems to be unavailable. The precise error was:</" @@ -1067,15 +1082,15 @@ "p><p>เว็บไซต์อาจปิดตัวชั่วคราวหรือย้ายไปยังที่ใหม่ " "คุณอาจต้องการตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณด้วย</p>" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1889 msgid "Try again" msgstr "ลองใหม่" -#: ../embed/ephy-web-view.c:1886 +#: ../embed/ephy-web-view.c:1895 msgid "Oops! There may be a problem." msgstr "โอ๊ะ! อาจจะมีปัญหา" -#: ../embed/ephy-web-view.c:1887 +#: ../embed/ephy-web-view.c:1896 #, c-format msgid "" "<p>This site may have caused Web to close unexpectedly.</p><p>If this " @@ -1085,41 +1100,41 @@ "<p>เว็บไซต์นี้อาจทำให้เว็บเบราว์เซอร์ปิดตัวกะทันหัน</p><p>ถ้าเกิดเหตุการณ์นี้อีกครั้ง " "ก็กรุณารายงานปัญหาไปยังนักพัฒนา <strong>%s</strong></p>" -#: ../embed/ephy-web-view.c:1892 ../embed/ephy-web-view.c:1899 +#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 msgid "Reload Anyway" msgstr "โหลดซ้ำต่อไป" -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1905 #, c-format msgid "Problem displaying “%s”" msgstr "เกิดปัญหาขณะแสดง “%s”" -#: ../embed/ephy-web-view.c:1897 +#: ../embed/ephy-web-view.c:1906 msgid "Oops!" msgstr "โอ๊ะ!" -#: ../embed/ephy-web-view.c:1898 +#: ../embed/ephy-web-view.c:1907 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." msgstr "มีบางอย่างผิดพลาดขณะแสดงหน้านี้ กรุณาโหลดซ้ำหรือเยี่ยมชมหน้าอื่นต่อไป" #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1915 msgid "Look out!" msgstr "ระวัง!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1909 +#: ../embed/ephy-web-view.c:1918 msgid "Load Anyway" msgstr "โหลดต่อไป" -#: ../embed/ephy-web-view.c:2809 +#: ../embed/ephy-web-view.c:2819 msgid "_OK" msgstr "_ตกลง" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:428 +#: ../src/bookmarks/ephy-bookmark-properties.c:432 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1130,23 +1145,19 @@ msgid "_Open" msgstr "_เปิด" -#: ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_บันทึก" - #: ../lib/ephy-file-chooser.c:209 msgid "All supported types" msgstr "ทุกชนิดที่รองรับ" -#: ../lib/ephy-file-chooser.c:221 +#: ../lib/ephy-file-chooser.c:223 msgid "Web pages" msgstr "หน้าเว็บ" -#: ../lib/ephy-file-chooser.c:230 +#: ../lib/ephy-file-chooser.c:234 msgid "Images" msgstr "รูปภาพ" -#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:637 +#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:637 msgid "All files" msgstr "ทุกชนิด" @@ -1462,7 +1473,7 @@ msgid "Cancel" msgstr "ยกเลิก" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1120 +#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 #: ../src/window-commands.c:275 msgid "Open" msgstr "เปิด" @@ -1479,8 +1490,7 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 -#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 msgid "Cl_ear" msgstr "_ล้าง" @@ -1505,29 +1515,33 @@ msgid_plural "%d bookmarks are similar" msgstr[0] "ที่คั่นหน้า %d รายการคล้ายกัน" -#: ../src/bookmarks/ephy-bookmark-properties.c:234 +#: ../src/bookmarks/ephy-bookmark-properties.c:235 +msgid "Add Bookmark" +msgstr "เพิ่มที่คั่นหน้า" + +#: ../src/bookmarks/ephy-bookmark-properties.c:237 #, c-format msgid "“%s” Properties" msgstr "คุณสมบัติของ “%s”" -#: ../src/bookmarks/ephy-bookmark-properties.c:358 +#: ../src/bookmarks/ephy-bookmark-properties.c:362 msgid "_Title:" msgstr "_ชื่อ:" -#: ../src/bookmarks/ephy-bookmark-properties.c:375 +#: ../src/bookmarks/ephy-bookmark-properties.c:379 msgid "A_ddress:" msgstr "_ที่อยู่:" -#: ../src/bookmarks/ephy-bookmark-properties.c:387 +#: ../src/bookmarks/ephy-bookmark-properties.c:391 msgid "T_opics:" msgstr "ห_มวด:" -#: ../src/bookmarks/ephy-bookmark-properties.c:410 +#: ../src/bookmarks/ephy-bookmark-properties.c:414 msgid "Sho_w all topics" msgstr "แสด_งทุกหมวด" -#: ../src/bookmarks/ephy-bookmark-properties.c:431 -#: ../src/resources/prefs-dialog.ui.h:41 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" msgstr "เ_พิ่ม" @@ -1964,6 +1978,22 @@ msgid "Delete the selected cookies" msgstr "ลบคุกกี้ที่เลือก" +#: ../src/resources/encoding-dialog.ui.h:1 +msgid "Text Encoding" +msgstr "รหัสอักขระ" + +#: ../src/resources/encoding-dialog.ui.h:2 ../src/ephy-encoding-menu.c:327 +msgid "_Automatic" +msgstr "อัตโ_นมัติ" + +#: ../src/resources/encoding-dialog.ui.h:3 ../src/ephy-encoding-menu.c:328 +msgid "Use the encoding specified by the document" +msgstr "ใช้รหัสอักขระที่ระบุในเอกสาร" + +#: ../src/resources/encoding-dialog.ui.h:4 +msgid "_Use a different encoding:" +msgstr "ใ_ช้รหัสอักขระอื่น:" + #. File actions. #: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:98 msgid "_New Window" @@ -1994,22 +2024,6 @@ msgid "_Quit" msgstr "_ออก" -#: ../src/resources/epiphany.ui.h:1 -msgid "Text Encoding" -msgstr "รหัสอักขระ" - -#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327 -msgid "_Automatic" -msgstr "อัตโ_นมัติ" - -#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328 -msgid "Use the encoding specified by the document" -msgstr "ใช้รหัสอักขระที่ระบุในเอกสาร" - -#: ../src/resources/epiphany.ui.h:4 -msgid "_Use a different encoding:" -msgstr "ใ_ช้รหัสอักขระอื่น:" - #: ../src/resources/history-dialog.ui.h:1 msgid "History" msgstr "ประวัติ" @@ -2156,8 +2170,8 @@ msgstr "แบบอักษรและรูปลักษณ์" #: ../src/resources/prefs-dialog.ui.h:22 -msgid "Manage _Cookies" -msgstr "จัดการคุก_กี้" +msgid "Manage _Cookies…" +msgstr "จัดการคุก_กี้…" #: ../src/resources/prefs-dialog.ui.h:23 msgid "_Always accept" @@ -2185,58 +2199,58 @@ msgstr "แ_จ้งเว็บไซต์ว่าฉันไม่ต้องการถูกติดตามการเชื่อมต่อ" #: ../src/resources/prefs-dialog.ui.h:31 -msgid "Manage _Passwords" -msgstr "จัดการร_หัสผ่าน" +msgid "Manage _Passwords…" +msgstr "จัดการร_หัสผ่าน…" #: ../src/resources/prefs-dialog.ui.h:32 msgid "_Remember passwords" msgstr "จำรหัส_ผ่านต่างๆ" #: ../src/resources/prefs-dialog.ui.h:33 -msgid "Temporary Files" -msgstr "แฟ้มชั่วคราว" +msgid "Stored Data" +msgstr "ข้อมูลที่ถูกเก็บไว้" #: ../src/resources/prefs-dialog.ui.h:34 -msgid "_Disk space:" -msgstr "เนื้อ_ที่บนดิสก์:" +msgid "You can clear stored personal data." +msgstr "คุณสามารถล้างข้อมูลส่วนตัวที่ถูกเก็บไว้ได้" #: ../src/resources/prefs-dialog.ui.h:35 -msgid "MB" -msgstr "MB" +msgid "Cl_ear Personal Data…" +msgstr "_ล้างข้อมูลส่วนตัว…" -#: ../src/resources/prefs-dialog.ui.h:37 +#: ../src/resources/prefs-dialog.ui.h:36 msgid "Privacy" msgstr "ความเป็นส่วนตัว" -#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379 +#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-encoding-dialog.c:379 msgid "Encodings" msgstr "รหัสอักขระ" -#: ../src/resources/prefs-dialog.ui.h:39 +#: ../src/resources/prefs-dialog.ui.h:38 msgid "De_fault:" msgstr "ค่า_ปริยาย:" -#: ../src/resources/prefs-dialog.ui.h:42 +#: ../src/resources/prefs-dialog.ui.h:41 msgid "_Remove" msgstr "ล_บ" -#: ../src/resources/prefs-dialog.ui.h:43 +#: ../src/resources/prefs-dialog.ui.h:42 msgid "_Up" msgstr "_ขึ้น" -#: ../src/resources/prefs-dialog.ui.h:44 +#: ../src/resources/prefs-dialog.ui.h:43 msgid "_Down" msgstr "_ลง" -#: ../src/resources/prefs-dialog.ui.h:45 +#: ../src/resources/prefs-dialog.ui.h:44 msgid "Spell checking" msgstr "การตรวจตัวสะกด" -#: ../src/resources/prefs-dialog.ui.h:46 +#: ../src/resources/prefs-dialog.ui.h:45 msgid "_Enable spell checking" msgstr "เปิดใ_ช้การตรวจตัวสะกด" -#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:840 +#: ../src/resources/prefs-dialog.ui.h:46 ../src/prefs-dialog.c:840 msgid "Language" msgstr "ภาษา" @@ -2355,7 +2369,7 @@ msgid "Web options" msgstr "ตัวเลือกของโปรแกรมดูเว็บ" -#: ../src/ephy-notebook.c:602 +#: ../src/ephy-notebook.c:615 msgid "Close tab" msgstr "ปิดแท็บ" @@ -2554,77 +2568,77 @@ msgid "_Copy Audio Address" msgstr "_คัดลอกที่อยู่เสียง" -#: ../src/ephy-window.c:466 +#: ../src/ephy-window.c:467 msgid "There are unsubmitted changes to form elements" msgstr "มีการเปลี่ยนแปลงในช่องข้อมูลแบบฟอร์มที่ยังไม่ส่ง" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:468 msgid "If you close the document anyway, you will lose that information." msgstr "ถ้าคุณปิดเอกสาร คุณจะเสียข้อมูลเหล่านี้" -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:470 msgid "Close _Document" msgstr "ปิ_ดเอกสาร" -#: ../src/ephy-window.c:484 +#: ../src/ephy-window.c:485 msgid "There are ongoing downloads in this window" msgstr "ยังมีรายการดาวน์โหลดในหน้าต่างนี้ที่ดำเนินการอยู่" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:486 msgid "If you close this window, the downloads will be cancelled" msgstr "ถ้าคุณปิดหน้าต่างนี้ รายการดาวน์โหลดดังกล่าวจะถูกยกเลิก" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:487 msgid "Close window and cancel downloads" msgstr "ปิดหน้าต่างและยกเลิกการดาวน์โหลด" -#: ../src/ephy-window.c:1122 +#: ../src/ephy-window.c:1123 msgid "Save As" msgstr "บันทึกเป็น" -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1125 msgid "Save As Application" msgstr "บันทึกเป็นโปรแกรมเว็บ" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1127 msgid "Print" msgstr "พิมพ์" -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1129 msgid "Bookmark" msgstr "ที่คั่นหน้า" -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1131 msgid "Find" msgstr "ค้นหา" #. Translators: This refers to text size -#: ../src/ephy-window.c:1139 +#: ../src/ephy-window.c:1140 msgid "Larger" msgstr "ใหญ่ขึ้น" #. Translators: This refers to text size -#: ../src/ephy-window.c:1142 +#: ../src/ephy-window.c:1143 msgid "Smaller" msgstr "เล็กลง" -#: ../src/ephy-window.c:1164 +#: ../src/ephy-window.c:1165 msgid "Back" msgstr "ย้อนกลับ" -#: ../src/ephy-window.c:1176 +#: ../src/ephy-window.c:1177 msgid "Forward" msgstr "ต่อไป" -#: ../src/ephy-window.c:1188 +#: ../src/ephy-window.c:1189 msgid "Zoom" msgstr "ย่อ-ขยาย" -#: ../src/ephy-window.c:1197 +#: ../src/ephy-window.c:1198 msgid "New _Tab" msgstr "เปิดแ_ท็บใหม่" -#: ../src/ephy-window.c:1205 +#: ../src/ephy-window.c:1206 msgid "Go to most visited" msgstr "ไปยังหน้าที่ไปบ่อย" @@ -2678,33 +2692,37 @@ #. * you chose in the gschema, but with & instead of & #. * If the match is not exact, there will be a spurious, ugly #. * entry in the preferences combo, so please test this. -#: ../src/prefs-dialog.c:1023 +#: ../src/prefs-dialog.c:1024 #, c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany"; msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=th-th&kad=th_TH"; #. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1025 +#: ../src/prefs-dialog.c:1026 msgid "Google" msgstr "Google" #. For the preferences dialog. Consider a regional variant, like google.co.uk -#: ../src/prefs-dialog.c:1027 +#: ../src/prefs-dialog.c:1029 #, c-format msgid "https://google.com/search?q=%s"; msgstr "https://google.co.th/search?q=%s"; #. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1029 +#: ../src/prefs-dialog.c:1031 msgid "Bing" msgstr "Bing" #. For the preferences dialog. Consider a regional variant, like uk.bing.com -#: ../src/prefs-dialog.c:1031 +#: ../src/prefs-dialog.c:1034 #, c-format msgid "https://www.bing.com/search?q=%s"; msgstr "https://www.bing.com/search?q=%s"; +#: ../src/window-commands.c:330 +msgid "Save" +msgstr "บันทึก" + #: ../src/window-commands.c:710 #, c-format msgid "A web application named '%s' already exists. Do you want to replace it?" @@ -2803,6 +2821,21 @@ msgid "_Enable" msgstr "เ_ปิดใช้" +#~ msgid "Size of disk cache" +#~ msgstr "เนื้อที่ของแคชบนดิสก์" + +#~ msgid "Size of disk cache, in MB." +#~ msgstr "เนื้อที่ของแคชบนดิสก์ เป็น MB" + +#~ msgid "Temporary Files" +#~ msgstr "แฟ้มชั่วคราว" + +#~ msgid "_Disk space:" +#~ msgstr "เนื้อ_ที่บนดิสก์:" + +#~ msgid "MB" +#~ msgstr "MB" + #~ msgid "http://www.google.com"; #~ msgstr "http://www.google.co.th"; @@ -4266,9 +4299,6 @@ #~ msgid "_Abort Script" #~ msgstr "เ_ลิกทำสคริปต์" -#~ msgid "Don't Save" -#~ msgstr "ไ_ม่บันทึก" - #~ msgid "Text files" #~ msgstr "แฟ้มข้อความ" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/src/ephy-shell-search-provider-generated.c new/epiphany-3.16.2/src/ephy-shell-search-provider-generated.c --- old/epiphany-3.16.1/src/ephy-shell-search-provider-generated.c 2015-04-08 16:28:40.000000000 +0200 +++ new/epiphany-3.16.2/src/ephy-shell-search-provider-generated.c 2015-06-23 14:02:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.44.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.45.2. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/epiphany-3.16.1/src/ephy-shell-search-provider-generated.h new/epiphany-3.16.2/src/ephy-shell-search-provider-generated.h --- old/epiphany-3.16.1/src/ephy-shell-search-provider-generated.h 2015-04-08 16:28:40.000000000 +0200 +++ new/epiphany-3.16.2/src/ephy-shell-search-provider-generated.h 2015-06-23 14:02:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.44.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.45.2. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */
