diff options
Diffstat (limited to 'WebKit/gtk')
22 files changed, 1011 insertions, 389 deletions
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog index 16f4063..c602ac1 100644 --- a/WebKit/gtk/ChangeLog +++ b/WebKit/gtk/ChangeLog @@ -1,3 +1,192 @@ +2010-09-28 Jenn Braithwaite <jennb@chromium.org> + + Reviewed by Dmitry Titov. + + Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. + https://bugs.webkit.org/show_bug.cgi?id=46663 + + * WebCoreSupport/FrameLoaderClientGtk.cpp: + (WebKit::FrameLoaderClient::didTransferChildFrameToNewDocument): + * WebCoreSupport/FrameLoaderClientGtk.h: + +2010-09-27 Mario Sanchez Prada <msanchez@igalia.com> + + Reviewed by Chris Fleizach. + + [Gtk] Adjust atk_text_get_text_at_offset to account for bullets/numbers in list items + https://bugs.webkit.org/show_bug.cgi?id=45381 + + Updated test to match the new exposure of list item markers. + + Also, added some extra assertions in that test to make sure the + accessible objects associated to the items implement AtkText. + + * tests/testatk.c: + (testWebkitAtkListsOfItems): + (main): + +2010-09-27 Philippe Normand <pnormand@igalia.com> + + Reviewed by Martin Robinson. + + [GTK] Doesn't build with gtk+ 2.14 + https://bugs.webkit.org/show_bug.cgi?id=46565 + + Fixed the build for GTK+ 2.14. Don't use gdk_window_get_cursor() + for that GTK+ version as I found no acceptable way to work-around + its absence. + + * WebCoreSupport/FullscreenVideoController.cpp: + (FullscreenVideoController::showHud): + (FullscreenVideoController::hideHud): + (FullscreenVideoController::enterFullscreen): + +2010-09-26 Jenn Braithwaite <jennb@chromium.org> + + Reviewed by Adam Barth. + + GTK client needs updating when live iframe element is moved + between pages. + https://bugs.webkit.org/show_bug.cgi?id=46300 + + Test: fast/frames/iframe-reparenting-adopt-node.html + + * WebCoreSupport/FrameLoaderClientGtk.cpp: + (WebKit::FrameLoaderClient::didTransferChildFrameToNewDocument): + Update the webView for the frame to match the parent frame's + webView. + +2010-09-24 Martin Robinson <mrobinson@igalia.com> + + Reviewed by Gustavo Noronha Silva. + + [GTK] opening local files on win32 + https://bugs.webkit.org/show_bug.cgi?id=31066 + + Add tests that check the mime type returned by local files loaded via file URLs. + + * tests/testmimehandling.c: + (testRemoteMimeType): Added. + (testLocalMimeType): Added. + (main): Run tests by using g_test_add_data_func with either + testRemoteMimeType or testLocalMimeType. + +2010-09-23 Martin Robinson <mrobinson@igalia.com> + + Reviewed by Nate Chapin. + + [GTK] Some tests from r68174 fail on the GTK+ bots + https://bugs.webkit.org/show_bug.cgi?id=46396 + + Fix since version number in this new WebKitWebSettings property. + + * webkit/webkitwebsettings.cpp: + (webkit_web_settings_class_init): Fix the since version number. + +2010-09-23 Nate Chapin <japhet@chromium.org> + + Unreviewed, build fix. + + Add a missing comma in webkitwebsettings.cpp. + + * webkit/webkitwebsettings.cpp: + +2010-09-23 Nate Chapin <japhet@chromium.org> + + Reviewed by Darin Fisher. + + Add hyperlink auditing settings (i.e., <a ping>). + https://bugs.webkit.org/show_bug.cgi?id=30458 + + * webkit/webkitwebsettings.cpp: + (webkit_web_settings_class_init): + (webkit_web_settings_set_property): + (webkit_web_settings_get_property): + (webkit_web_settings_copy): + * webkit/webkitwebview.cpp: + (webkit_web_view_update_settings): + (webkit_web_view_settings_notify): + +2010-09-22 Mario Sanchez Prada <msanchez@igalia.com> + + Reviewed by Martin Robinson. + + [GTK] Replace instances of g_timeout_add() with g_idle_add() in testatk.c + https://bugs.webkit.org/show_bug.cgi?id=46284 + + Use g_idle_add() whenever g_timeout_add() was being used. + + This is desired because it's better to rely on the main loop to + decide when it's a good moment to execute the task (when idle) + than manually setting a timeout, which also sets a minimum amount + of time needed to get the function executed. + + * tests/testatk.c: + (testWekitAtkTextSelections): + (testWebkitAtkGetExtents): + (testWebkitAtkListsOfItems): + (main): + +2010-09-22 Mario Sanchez Prada <msanchez@igalia.com> + + Reviewed by Martin Robinson. + + [Gtk] object:text-changed events should be emitted for entries and password text + https://bugs.webkit.org/show_bug.cgi?id=25898 + + New unit test to make sure text-changed signals are emitted + + * tests/testatk.c: + (textChangedCb): New. Signal handler for the + text-changed::insert and text-changed::delete signals. + (checkTextChangesAndBailOut): New. Source function to check + the global result of the test and quit from the main loop. + (testWebkitAtkTextChangedNotifications): New test. + (main): + +2010-09-22 Martin Robinson <mrobinson@igalia.com> + + Reviewed by Xan Lopez. + + Added information about drop shadow improvements to the NEWS file. + + * NEWS: Added information about drop shadow improvements. + +2010-09-21 Xan Lopez <xlopez@igalia.com> + + Reviewed by Martin Robinson. + + [GTK] Fix transfer annotations for WebKitGTK+ static API + https://bugs.webkit.org/show_bug.cgi?id=46244 + + Deal with all the warnings related to transfer issues. Mostly the + problem was the transfer being missing, but there were also typos + in the function name or missing ':' at the end of the function + name in the gtk-doc. + + * webkit/webkitdownload.cpp: + * webkit/webkitnetworkrequest.cpp: + * webkit/webkitnetworkresponse.cpp: + * webkit/webkitsecurityorigin.cpp: + * webkit/webkitwebdatabase.cpp: + * webkit/webkitwebdatasource.cpp: + * webkit/webkitwebframe.cpp: + * webkit/webkitwebhistoryitem.cpp: + * webkit/webkitwebinspector.cpp: + * webkit/webkitwebresource.cpp: + * webkit/webkitwebsettings.cpp: + * webkit/webkitwebview.cpp: + (webkit_web_view_class_init): + (webkit_web_view_get_main_frame): + +2010-09-21 Xan Lopez <xlopez@igalia.com> + + Reviewed by Gustavo Noronha. + + Update for 1.3.4 release. + + * NEWS: + 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. diff --git a/WebKit/gtk/NEWS b/WebKit/gtk/NEWS index 402c07c..ebeb699 100644 --- a/WebKit/gtk/NEWS +++ b/WebKit/gtk/NEWS @@ -4,13 +4,31 @@ WebKitGTK+ 1.3.4 What's new in WebKitGTK+ 1.3.4? - - Fixes to compile with latest GTK+ changes. - File reader/writer APIs are now enabled. - The javascript JIT is now enabled by default on ARM. - Clipboard data is no longer lost when the process exists. - Image DnD support. - GSettings support to save/restore Web Inspector settings. + - Add WebSocket support, now enabled by default. + - Added WebKitWebView::frame-created signal, emitted when a frame + other than the main frame is created in a view. + - Added WebKitWebView::view-mode, holding information about how the + view is being presented. See the property documentation and + http://www.w3.org/TR/view-mode/ for details. - Fullscreen support for HTML5 media player. + - Identify as WebKit/Safari in Google domains when + enable-site-specific-quirks is activated. Otherwise we'll get a + degraded user experience due to their poor UA detection + algorihtms. + - Added simple media playback options in the context menu for the + media elements. + - Update (and require) to work with gobjet-introspection 0.9.5. + - Updated to work with GTK+ 3.x 2.90.7 when in GTK+ 3.x mode. + - Make --disable-jit actually work. + - Add --enable-opcode-stats configure flag. When enabled, statistics + about opcode generation will be printed by JSC. + - Many a11y fixes, particularly in the AtkText interface. + - CSS box shadows render much faster in many cases. - Many other bugfixes. ================ diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp index 93b4cc2..13401f5 100644 --- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp @@ -601,8 +601,21 @@ PassRefPtr<Frame> FrameLoaderClient::createFrame(const KURL& url, const String& return childFrame.release(); } -void FrameLoaderClient::didTransferChildFrameToNewDocument() +void FrameLoaderClient::didTransferChildFrameToNewDocument(WebCore::Page*) { + ASSERT(m_frame); + + // Update the frame's webview to the new parent's webview. + Frame* coreFrame = core(m_frame); + WebKitWebView* webView = getViewFromFrame(m_frame); + + Frame* parentCoreFrame = coreFrame->tree()->parent(); + WebKitWebFrame* parentKitFrame = kit(parentCoreFrame); + WebKitWebView* parentWebView = getViewFromFrame(parentKitFrame); + if (webView != parentWebView) + m_frame->priv->webView = parentWebView; + + ASSERT(core(getViewFromFrame(m_frame)) == coreFrame->page()); } void FrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget) diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h index c5ffc6a..206e780 100644 --- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h @@ -114,7 +114,7 @@ namespace WebKit { virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); - virtual void didTransferChildFrameToNewDocument(); + virtual void didTransferChildFrameToNewDocument(WebCore::Page*); virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const WTF::Vector<WTF::String>&, const WTF::Vector<WTF::String>&, const WTF::String&, bool); virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget); virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues); diff --git a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp index cf9a548..01bc03a 100644 --- a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp +++ b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp @@ -175,7 +175,7 @@ void FullscreenVideoController::showHud(bool autoHide) // Show the cursor. GdkWindow* window = gtk_widget_get_window(m_window); - gdk_window_set_cursor(window, m_cursor.get()); + gdk_window_set_cursor(window, 0); // Update the progress bar immediately before showing the window. updateHudProgressBar(); @@ -210,7 +210,7 @@ void FullscreenVideoController::hideHud() } GdkWindow* window = gtk_widget_get_window(m_window); - GdkCursor* cursor = gdk_cursor_new(GDK_BLANK_CURSOR); + GdkCursor* cursor = blankCursor(); gdk_window_set_cursor(window, cursor); gtk_widget_hide_all(m_hudWindow); @@ -283,8 +283,7 @@ void FullscreenVideoController::enterFullscreen() gtk_widget_show_all(m_window); GdkWindow* window = gtk_widget_get_window(m_window); - GdkCursor* cursor = gdk_cursor_new(GDK_BLANK_CURSOR); - m_cursor = gdk_window_get_cursor(window); + GdkCursor* cursor = blankCursor(); gdk_window_set_cursor(window, cursor); gdk_cursor_unref(cursor); diff --git a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h index 9ff1e6a..d4bbea2 100644 --- a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h +++ b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h @@ -82,7 +82,6 @@ private: guint m_volumeUpdateId; bool m_seekLock; GtkWidget* m_window; - PlatformRefPtr<GdkCursor> m_cursor; GtkWidget* m_hudWindow; GtkAction* m_playPauseAction; GtkAction* m_exitFullscreenAction; diff --git a/WebKit/gtk/po/ChangeLog b/WebKit/gtk/po/ChangeLog index 3665005..19e86ae 100644 --- a/WebKit/gtk/po/ChangeLog +++ b/WebKit/gtk/po/ChangeLog @@ -1,3 +1,12 @@ +2010-09-29 Reinout van Schouwen <reinouts@gnome.org> + + Reviewed by Gustavo Noronha. + + [GTK] Updated Dutch translation + https://bugs.webkit.org/show_bug.cgi?id=46050 + + * nl.po: + 2010-08-31 Sheriff Bot <webkit.review.bot@gmail.com> Unreviewed, rolling out r66519. diff --git a/WebKit/gtk/po/nl.po b/WebKit/gtk/po/nl.po index aa2da82..e33e284 100644 --- a/WebKit/gtk/po/nl.po +++ b/WebKit/gtk/po/nl.po @@ -1,1074 +1,1355 @@ # Dutch translation of webkit-gtk # Released under the same license as webkit-gtk -# Reinout van Schouwen <reinouts@gnome.org>, 2009 +# Reinout van Schouwen <reinouts@gnome.org>, 2009, 2010 # msgid "" msgstr "" "Project-Id-Version: webkit 1.1.10\n" -"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n" -"POT-Creation-Date: 2010-02-16 15:01-0200\n" -"PO-Revision-Date: 2010-03-22 00:27+0100\n" +"Report-Msgid-Bugs-To: http://bugs.webkit.org\n" +"POT-Creation-Date: 2010-09-08 03:26+0000\n" +"PO-Revision-Date: 2010-09-19 17:01+0100\n" "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535 +#: ../WebCoreSupport/ChromeClientGtk.cpp:569 msgid "Upload File" msgstr "Bestand uploaden" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:61 -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:143 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:61 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:143 msgid "Input _Methods" msgstr "Invoer_methoden" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:78 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:78 msgid "LRM _Left-to-right mark" msgstr "LRM _Links-naar-rechts markering" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:79 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:79 msgid "RLM _Right-to-left mark" msgstr "RLM _Rechts-naar-links markering" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:80 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:80 msgid "LRE Left-to-right _embedding" msgstr "LRE Links-naar-rechts _inbedding" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:81 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:81 msgid "RLE Right-to-left e_mbedding" msgstr "RLE Rechts-naar-links i_nbedding" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:82 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:82 msgid "LRO Left-to-right _override" msgstr "LRO Links-naar-rechts _tenietdoen" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:83 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:83 msgid "RLO Right-to-left o_verride" msgstr "RLO Rechts-naar-links t_enietdoen" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:84 msgid "PDF _Pop directional formatting" msgstr "PDF _Pop richtingsformattering" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:85 msgid "ZWS _Zero width space" msgstr "ZWS Spatie _zonder breedte" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:86 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:86 msgid "ZWJ Zero width _joiner" msgstr "ZWJ _koppelaar zonder breedte" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:87 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:87 msgid "ZWNJ Zero width _non-joiner" msgstr "ZWNJ Niet-k_oppelaar zonder breedte" -#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:109 -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:138 +#: ../WebCoreSupport/ContextMenuClientGtk.cpp:109 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:138 msgid "_Insert Unicode Control Character" msgstr "_Unicode controleteken invoegen " -#: WebKit/gtk/webkit/webkitdownload.cpp:262 +#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1038 +msgid "Load request cancelled" +msgstr "Laadaanvraag geannuleerd" + +#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1044 +msgid "Not allowed to use restricted network port" +msgstr "Gebruik van beperkte netwerkpoort niet toegestaan" + +#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1050 +msgid "URL cannot be shown" +msgstr "Kan URL niet tonen" + +#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1056 +msgid "Frame load was interrupted" +msgstr "Laden van het frame onderbroken" + +#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1062 +msgid "Content with the specified MIME type cannot be shown" +msgstr "Kan inhoud met het aangegeven MIME-type niet tonen" + +#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1068 +msgid "File does not exist" +msgstr "Bestand bestaat niet" + +#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1074 +msgid "Plugin will handle load" +msgstr "Plug-in handelt het laden af" + +#: ../WebCoreSupport/FullscreenVideoController.cpp:385 +#| msgid "play" +msgid "Play" +msgstr "Afspelen" + +#: ../WebCoreSupport/FullscreenVideoController.cpp:387 +#| msgid "pause" +msgid "Pause" +msgstr "Pauzeren" + +#: ../WebCoreSupport/FullscreenVideoController.cpp:533 +msgid "Play / Pause" +msgstr "Afspelen / pauzeren" + +#: ../WebCoreSupport/FullscreenVideoController.cpp:533 +msgid "Play or pause the media" +msgstr "De media afspelen of pauzeren" + +#: ../WebCoreSupport/FullscreenVideoController.cpp:541 +msgid "Time:" +msgstr "Tijd:" + +#: ../WebCoreSupport/FullscreenVideoController.cpp:565 +msgid "Exit Fullscreen" +msgstr "Volledig scherm verlaten" + +#: ../WebCoreSupport/FullscreenVideoController.cpp:565 +msgid "Exit from fullscreen mode" +msgstr "Volledig scherm verlaten" + +#: ../webkit/webkitdownload.cpp:272 msgid "Network Request" msgstr "Netwerkaanvraag" -#: WebKit/gtk/webkit/webkitdownload.cpp:263 +#: ../webkit/webkitdownload.cpp:273 msgid "The network request for the URI that should be downloaded" msgstr "De netwerkaanvraag voor de te downloaden URI" -#: WebKit/gtk/webkit/webkitdownload.cpp:277 +#: ../webkit/webkitdownload.cpp:287 msgid "Network Response" msgstr "Netwerkantwoord" -#: WebKit/gtk/webkit/webkitdownload.cpp:278 +#: ../webkit/webkitdownload.cpp:288 msgid "The network response for the URI that should be downloaded" msgstr "Het netwerkantwoord voor de te downloaden URI" -#: WebKit/gtk/webkit/webkitdownload.cpp:292 +#: ../webkit/webkitdownload.cpp:302 msgid "Destination URI" msgstr "Bestemmings-URI" -#: WebKit/gtk/webkit/webkitdownload.cpp:293 +#: ../webkit/webkitdownload.cpp:303 msgid "The destination URI where to save the file" msgstr "De bestemmings-URI waar dit bestand opgeslagen moet worden" -#: WebKit/gtk/webkit/webkitdownload.cpp:307 +#: ../webkit/webkitdownload.cpp:317 msgid "Suggested Filename" msgstr "Gesuggereerde bestandsnaam" -#: WebKit/gtk/webkit/webkitdownload.cpp:308 +#: ../webkit/webkitdownload.cpp:318 msgid "The filename suggested as default when saving" msgstr "De standaard gesuggereerde bestandsnaam bij het opslaan" -#: WebKit/gtk/webkit/webkitdownload.cpp:325 +#: ../webkit/webkitdownload.cpp:335 msgid "Progress" msgstr "Voortgang" -#: WebKit/gtk/webkit/webkitdownload.cpp:326 +#: ../webkit/webkitdownload.cpp:336 msgid "Determines the current progress of the download" msgstr "Bepaalt de huidige voortgang van de download" -#: WebKit/gtk/webkit/webkitdownload.cpp:339 +#: ../webkit/webkitdownload.cpp:349 msgid "Status" msgstr "Status" -#: WebKit/gtk/webkit/webkitdownload.cpp:340 +#: ../webkit/webkitdownload.cpp:350 msgid "Determines the current status of the download" msgstr "Bepaalt de huidige status van de download" -#: WebKit/gtk/webkit/webkitdownload.cpp:355 +#: ../webkit/webkitdownload.cpp:365 msgid "Current Size" msgstr "Huidige grootte" -#: WebKit/gtk/webkit/webkitdownload.cpp:356 +#: ../webkit/webkitdownload.cpp:366 msgid "The length of the data already downloaded" msgstr "De hoeveelheid reeds gedownloade data" -#: WebKit/gtk/webkit/webkitdownload.cpp:370 +#: ../webkit/webkitdownload.cpp:380 msgid "Total Size" msgstr "Totale grootte" -#: WebKit/gtk/webkit/webkitdownload.cpp:371 +#: ../webkit/webkitdownload.cpp:381 msgid "The total size of the file" msgstr "De totale grootte van het bestand" -#: WebKit/gtk/webkit/webkitdownload.cpp:522 +#: ../webkit/webkitdownload.cpp:532 msgid "User cancelled the download" msgstr "Downloaden door gebruiker gestopt" -#: WebKit/gtk/webkit/webkitsoupauthdialog.c:244 +#: ../webkit/webkithittestresult.cpp:148 +msgid "Context" +msgstr "Context" + +#: ../webkit/webkithittestresult.cpp:149 +msgid "Flags indicating the kind of target that received the event." +msgstr "Markeringen die het soort doel beschrijven voor ontvangst van de gebeurtenis." + +#: ../webkit/webkithittestresult.cpp:163 +msgid "Link URI" +msgstr "Verwijzings-URI" + +#: ../webkit/webkithittestresult.cpp:164 +msgid "The URI to which the target that received the event points, if any." +msgstr "De URI waarnaar het doel wijst dat de gebeurtenispunten ontvangen heeft, indien aanwezig." + +#: ../webkit/webkithittestresult.cpp:177 +msgid "Image URI" +msgstr "Afbeeldings-URI" + +#: ../webkit/webkithittestresult.cpp:178 +msgid "" +"The URI of the image that is part of the target that received the event, if " +"any." +msgstr "" +"De URI van de afbeelding die onderdeel is van het doel voor gebeurtenisontvangst, indien aanwezig." + +#: ../webkit/webkithittestresult.cpp:191 +msgid "Media URI" +msgstr "Media-URI" + +#: ../webkit/webkithittestresult.cpp:192 +msgid "" +"The URI of the media that is part of the target that received the event, if " +"any." +msgstr "" +"De URI van de media die onderdeel zijn van het doel voor gebeurtenisontvangst, indien aanwezig." + +#: ../webkit/webkithittestresult.cpp:213 +msgid "Inner node" +msgstr "Ingesloten node" + +#: ../webkit/webkithittestresult.cpp:214 +msgid "The inner DOM node associated with the hit test result." +msgstr "De ingesloten DOM-node die geassocieerd is met het hittestresultaat." + +#: ../webkit/webkitnetworkrequest.cpp:136 +#: ../webkit/webkitnetworkresponse.cpp:134 ../webkit/webkitwebframe.cpp:315 +#: ../webkit/webkitwebhistoryitem.cpp:178 ../webkit/webkitwebresource.cpp:126 +#: ../webkit/webkitwebview.cpp:2653 +msgid "URI" +msgstr "URI" + +#: ../webkit/webkitnetworkrequest.cpp:137 +msgid "The URI to which the request will be made." +msgstr "De URI waarnaar de aanvraag gestuurd wordt." + +#: ../webkit/webkitnetworkrequest.cpp:150 +#: ../webkit/webkitnetworkresponse.cpp:148 +msgid "Message" +msgstr "Bericht" + +#: ../webkit/webkitnetworkrequest.cpp:151 +msgid "The SoupMessage that backs the request." +msgstr "De SoupMessage die achter de aanvraag zit." + +#: ../webkit/webkitnetworkresponse.cpp:135 +msgid "The URI to which the response will be made." +msgstr "De URI waarnaar het antwoord verstuurd wordt." + +#: ../webkit/webkitnetworkresponse.cpp:149 +msgid "The SoupMessage that backs the response." +msgstr "De SoupMessage die achter het antwoord zit." + +#: ../webkit/webkitsecurityorigin.cpp:151 +msgid "Protocol" +msgstr "Protocol" + +#: ../webkit/webkitsecurityorigin.cpp:152 +msgid "The protocol of the security origin" +msgstr "Het protocol van de beveiligingsbron" + +#: ../webkit/webkitsecurityorigin.cpp:165 +msgid "Host" +msgstr "Hostcomputer" + +#: ../webkit/webkitsecurityorigin.cpp:166 +msgid "The host of the security origin" +msgstr "De hostcomputer van de beveiligingsbron" + +#: ../webkit/webkitsecurityorigin.cpp:179 +msgid "Port" +msgstr "Poort" + +#: ../webkit/webkitsecurityorigin.cpp:180 +msgid "The port of the security origin" +msgstr "De poort van de beveiligingsbron" + +#: ../webkit/webkitsecurityorigin.cpp:193 +msgid "Web Database Usage" +msgstr "Web-databasegebruik" + +#: ../webkit/webkitsecurityorigin.cpp:194 +msgid "The cumulative size of all web databases in the security origin" +msgstr "De opgetelde grootte van alle webdatabases in de beveiligingsbron" + +#: ../webkit/webkitsecurityorigin.cpp:206 +msgid "Web Database Quota" +msgstr "Webdatabase-quota" + +#: ../webkit/webkitsecurityorigin.cpp:207 +msgid "The web database quota of the security origin in bytes" +msgstr "De webdatabase-quota voor de beveiligingsbron in bytes" + +#: ../webkit/webkitsoupauthdialog.c:251 #, c-format msgid "A username and password are being requested by the site %s" msgstr "De site %s vraagt een gebruikersnaam en wachtwoord" -#: WebKit/gtk/webkit/webkitsoupauthdialog.c:269 +#: ../webkit/webkitsoupauthdialog.c:281 +msgid "Server message:" +msgstr "Serverbericht:" + +#: ../webkit/webkitsoupauthdialog.c:294 msgid "Username:" msgstr "Gebruikersnaam:" -#: WebKit/gtk/webkit/webkitsoupauthdialog.c:271 +#: ../webkit/webkitsoupauthdialog.c:296 msgid "Password:" msgstr "Wachtwoord:" -#: WebKit/gtk/webkit/webkitsoupauthdialog.c:280 +#: ../webkit/webkitsoupauthdialog.c:305 msgid "_Remember password" msgstr "_Wachtwoord onthouden" -#: WebKit/gtk/webkit/webkitwebframe.cpp:298 +#: ../webkit/webkitwebdatabase.cpp:176 +msgid "Security Origin" +msgstr "Beveiligingsbron" + +#: ../webkit/webkitwebdatabase.cpp:177 +msgid "The security origin of the database" +msgstr "De beveiligingsbron van de database" + +#: ../webkit/webkitwebdatabase.cpp:190 ../webkit/webkitwebframe.cpp:301 msgid "Name" msgstr "Naam" -#: WebKit/gtk/webkit/webkitwebframe.cpp:299 +#: ../webkit/webkitwebdatabase.cpp:191 +msgid "The name of the Web Database database" +msgstr "De naam van de Web Database-database" + +#: ../webkit/webkitwebdatabase.cpp:204 +msgid "Display Name" +msgstr "Weergavenaam" + +#: ../webkit/webkitwebdatabase.cpp:205 +msgid "The display name of the Web Storage database" +msgstr "De weergavenaam van de Web Storage-database" + +#: ../webkit/webkitwebdatabase.cpp:218 +msgid "Expected Size" +msgstr "Verwachte grootte" + +#: ../webkit/webkitwebdatabase.cpp:219 +msgid "The expected size of the Web Database database" +msgstr "De verwachte grootte van de Web Database-database" + +#: ../webkit/webkitwebdatabase.cpp:231 +msgid "Size" +msgstr "Grootte" + +#: ../webkit/webkitwebdatabase.cpp:232 +msgid "The current size of the Web Database database" +msgstr "De huidige grootte van de Web Database-database" + +#: ../webkit/webkitwebdatabase.cpp:244 +msgid "Filename" +msgstr "Bestandsnaam" + +#: ../webkit/webkitwebdatabase.cpp:245 +msgid "The absolute filename of the Web Storage database" +msgstr "De absolute bestandsnaam van de Web Storage-database" + +#: ../webkit/webkitwebframe.cpp:302 msgid "The name of the frame" msgstr "Naam van het frame" -#: WebKit/gtk/webkit/webkitwebframe.cpp:305 -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:146 -#: WebKit/gtk/webkit/webkitwebview.cpp:2315 +#: ../webkit/webkitwebframe.cpp:308 ../webkit/webkitwebhistoryitem.cpp:146 +#: ../webkit/webkitwebview.cpp:2639 msgid "Title" msgstr "Titel" -#: WebKit/gtk/webkit/webkitwebframe.cpp:306 +#: ../webkit/webkitwebframe.cpp:309 msgid "The document title of the frame" msgstr "De titel van het huidige frame" -#: WebKit/gtk/webkit/webkitwebframe.cpp:312 -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:178 -#: WebKit/gtk/webkit/webkitwebview.cpp:2329 -msgid "URI" -msgstr "URI" - -#: WebKit/gtk/webkit/webkitwebframe.cpp:313 +#: ../webkit/webkitwebframe.cpp:316 msgid "The current URI of the contents displayed by the frame" msgstr "De huidige URI van de in het frame weergegeven inhoud" -#: WebKit/gtk/webkit/webkitwebframe.cpp:344 +#: ../webkit/webkitwebframe.cpp:347 msgid "Horizontal Scrollbar Policy" msgstr "Beleid voor horizontale schuifbalk" -#: WebKit/gtk/webkit/webkitwebframe.cpp:345 +#: ../webkit/webkitwebframe.cpp:348 msgid "" "Determines the current policy for the horizontal scrollbar of the frame." -msgstr "" -"Bepaalt het beleid voor de horizontale schuifbalk van het frame" +msgstr "Bepaalt het beleid voor de horizontale schuifbalk van het frame" -#: WebKit/gtk/webkit/webkitwebframe.cpp:362 +#: ../webkit/webkitwebframe.cpp:365 msgid "Vertical Scrollbar Policy" msgstr "Beleid voor verticale schuifbalk" -#: WebKit/gtk/webkit/webkitwebframe.cpp:363 +#: ../webkit/webkitwebframe.cpp:366 msgid "Determines the current policy for the vertical scrollbar of the frame." msgstr "Bepaalt het huidige beleid voor de verticale schuifbalk van het frame." -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147 +#: ../webkit/webkitwebhistoryitem.cpp:147 msgid "The title of the history item" msgstr "De titel van het geschiedenis-item" -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162 +#: ../webkit/webkitwebhistoryitem.cpp:162 msgid "Alternate Title" msgstr "Alternatieve titel" -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163 +#: ../webkit/webkitwebhistoryitem.cpp:163 msgid "The alternate title of the history item" msgstr "De alternatieve titel van het geschiedenis-item" -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:179 +#: ../webkit/webkitwebhistoryitem.cpp:179 msgid "The URI of the history item" msgstr "De URI van het geschiedenis-item" -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:194 -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:173 +#: ../webkit/webkitwebhistoryitem.cpp:194 +#: ../webkit/webkitwebnavigationaction.cpp:173 msgid "Original URI" msgstr "Originele URI" -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:195 +#: ../webkit/webkitwebhistoryitem.cpp:195 msgid "The original URI of the history item" msgstr "De originele URI van het geschiedenis-item" -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:210 +#: ../webkit/webkitwebhistoryitem.cpp:210 msgid "Last visited Time" msgstr "Laatst bezocht op" -#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:211 +#: ../webkit/webkitwebhistoryitem.cpp:211 msgid "The time at which the history item was last visited" msgstr "De tijd waarop het geschiedenis-item het laatst is bezocht" -#: WebKit/gtk/webkit/webkitwebinspector.cpp:268 +#: ../webkit/webkitwebinspector.cpp:269 msgid "Web View" msgstr "Webweergave" -#: WebKit/gtk/webkit/webkitwebinspector.cpp:269 +#: ../webkit/webkitwebinspector.cpp:270 msgid "The Web View that renders the Web Inspector itself" msgstr "De webweergave die die Webinspector zelf weergeeft" -#: WebKit/gtk/webkit/webkitwebinspector.cpp:282 +#: ../webkit/webkitwebinspector.cpp:283 msgid "Inspected URI" msgstr "Geïnspecteerde URI" -#: WebKit/gtk/webkit/webkitwebinspector.cpp:283 +#: ../webkit/webkitwebinspector.cpp:284 msgid "The URI that is currently being inspected" msgstr "De URI die momenteel geïnspecteerd wordt" -#: WebKit/gtk/webkit/webkitwebinspector.cpp:299 +#: ../webkit/webkitwebinspector.cpp:300 msgid "Enable JavaScript profiling" msgstr "JavaScript-profilering inschakelen" -#: WebKit/gtk/webkit/webkitwebinspector.cpp:300 +#: ../webkit/webkitwebinspector.cpp:301 msgid "Profile the executed JavaScript." msgstr "De uitgevoerde JavaScript profileren." -#: WebKit/gtk/webkit/webkitwebinspector.cpp:315 +#: ../webkit/webkitwebinspector.cpp:316 msgid "Enable Timeline profiling" msgstr "Tijdslijn-profilering inschakelen" -#: WebKit/gtk/webkit/webkitwebinspector.cpp:316 +#: ../webkit/webkitwebinspector.cpp:317 msgid "Profile the WebCore instrumentation." msgstr "De instrumentering van WebCore profileren." -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158 +#: ../webkit/webkitwebnavigationaction.cpp:158 msgid "Reason" msgstr "Reden" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:159 +#: ../webkit/webkitwebnavigationaction.cpp:159 msgid "The reason why this navigation is occurring" msgstr "De reden waarom deze navigatie optreedt" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:174 +#: ../webkit/webkitwebnavigationaction.cpp:174 msgid "The URI that was requested as the target for the navigation" msgstr "De URI die werd aangevraagd als bestemming voor de navigatie" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:188 +#: ../webkit/webkitwebnavigationaction.cpp:188 msgid "Button" msgstr "Knop" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:189 +#: ../webkit/webkitwebnavigationaction.cpp:189 msgid "The button used to click" msgstr "De knop voor het klikken" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:204 +#: ../webkit/webkitwebnavigationaction.cpp:204 msgid "Modifier state" msgstr "Staat van de optietoets" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:205 +#: ../webkit/webkitwebnavigationaction.cpp:205 msgid "A bitmask representing the state of the modifier keys" msgstr "Een bitmask dat de staat van de optietoets representeert" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220 +#: ../webkit/webkitwebnavigationaction.cpp:220 msgid "Target frame" msgstr "Doelframe" -#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221 +#: ../webkit/webkitwebnavigationaction.cpp:221 msgid "The target frame for the navigation" msgstr "Het doelframe voor de navigatie" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:233 +#: ../webkit/webkitwebresource.cpp:127 +msgid "The uri of the resource" +msgstr "De URI van de bron" + +#: ../webkit/webkitwebresource.cpp:141 +msgid "MIME Type" +msgstr "MIME-type" + +#: ../webkit/webkitwebresource.cpp:142 +msgid "The MIME type of the resource" +msgstr "De MIME-type van de bron" + +#: ../webkit/webkitwebresource.cpp:156 ../webkit/webkitwebview.cpp:2774 +msgid "Encoding" +msgstr "Codering" + +#: ../webkit/webkitwebresource.cpp:157 +msgid "The text encoding name of the resource" +msgstr "De tekstcoderingsnaam van de bron" + +#: ../webkit/webkitwebresource.cpp:172 +msgid "Frame Name" +msgstr "Framenaam" + +#: ../webkit/webkitwebresource.cpp:173 +msgid "The frame name of the resource" +msgstr "Naam van het frame van de bron" + +#: ../webkit/webkitwebsettings.cpp:241 msgid "Default Encoding" msgstr "Standaardcodering" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:234 +#: ../webkit/webkitwebsettings.cpp:242 msgid "The default encoding used to display text." msgstr "De standaardcodering om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:242 +#: ../webkit/webkitwebsettings.cpp:250 msgid "Cursive Font Family" msgstr "Cursive-lettertypefamilie" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:243 +#: ../webkit/webkitwebsettings.cpp:251 msgid "The default Cursive font family used to display text." msgstr "De standaard Cursive-lettertypefamilie om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:251 +#: ../webkit/webkitwebsettings.cpp:259 msgid "Default Font Family" msgstr "Standaard lettertypefamilie" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:252 +#: ../webkit/webkitwebsettings.cpp:260 msgid "The default font family used to display text." msgstr "De standaard lettertypefamilie om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:260 +#: ../webkit/webkitwebsettings.cpp:268 msgid "Fantasy Font Family" msgstr "Fantasy-lettertypefamilie" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:261 +#: ../webkit/webkitwebsettings.cpp:269 msgid "The default Fantasy font family used to display text." msgstr "De standaard Fantasy-lettertypefamilie om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:269 +#: ../webkit/webkitwebsettings.cpp:277 msgid "Monospace Font Family" msgstr "Monospace-lettertypefamilie" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:270 +#: ../webkit/webkitwebsettings.cpp:278 msgid "The default font family used to display monospace text." msgstr "De standaard lettertypefamilie om vaste-breedte-tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:278 +#: ../webkit/webkitwebsettings.cpp:286 msgid "Sans Serif Font Family" msgstr "Sans Serif-lettertypefamilie" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:279 +#: ../webkit/webkitwebsettings.cpp:287 msgid "The default Sans Serif font family used to display text." msgstr "De standaard Sans Serif-lettertypefamilie om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:287 +#: ../webkit/webkitwebsettings.cpp:295 msgid "Serif Font Family" msgstr "Serif-lettertypefamilie" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:288 +#: ../webkit/webkitwebsettings.cpp:296 msgid "The default Serif font family used to display text." msgstr "De standaard Serif-lettertypefamilie om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:296 +#: ../webkit/webkitwebsettings.cpp:304 msgid "Default Font Size" msgstr "Standaard korpsgrootte" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:297 +#: ../webkit/webkitwebsettings.cpp:305 msgid "The default font size used to display text." msgstr "De standaard korpsgrootte om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:305 +#: ../webkit/webkitwebsettings.cpp:313 msgid "Default Monospace Font Size" msgstr "Standaard Monospace-lettergrootte" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:306 +#: ../webkit/webkitwebsettings.cpp:314 msgid "The default font size used to display monospace text." msgstr "De standaard lettergrootte om vaste-breedte-tekst weer te geven." # Korpsgrootte/lettergrootte? -#: WebKit/gtk/webkit/webkitwebsettings.cpp:314 +#: ../webkit/webkitwebsettings.cpp:322 msgid "Minimum Font Size" msgstr "Minimum korpsgrootte" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:315 +#: ../webkit/webkitwebsettings.cpp:323 msgid "The minimum font size used to display text." msgstr "De minimum lettergrootte om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:323 +#: ../webkit/webkitwebsettings.cpp:331 msgid "Minimum Logical Font Size" msgstr "Minimum logische korpsgrootte" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:324 +#: ../webkit/webkitwebsettings.cpp:332 msgid "The minimum logical font size used to display text." msgstr "De minimum logische korpsgrootte om tekst weer te geven." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:343 +#: ../webkit/webkitwebsettings.cpp:351 msgid "Enforce 96 DPI" msgstr "96 DPI afdwingen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:344 +#: ../webkit/webkitwebsettings.cpp:352 msgid "Enforce a resolution of 96 DPI" msgstr "Een resolutie van 96 DPI afdwingen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:352 +#: ../webkit/webkitwebsettings.cpp:360 msgid "Auto Load Images" msgstr "Afbeeldingen automatisch laden" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:353 +#: ../webkit/webkitwebsettings.cpp:361 msgid "Load images automatically." msgstr "Automatisch afbeeldingen laden." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:361 +#: ../webkit/webkitwebsettings.cpp:369 msgid "Auto Shrink Images" msgstr "Afbeeldingen automatisch verkleinen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:362 +#: ../webkit/webkitwebsettings.cpp:370 msgid "Automatically shrink standalone images to fit." msgstr "Automatisch losstaande afbeeldingen passend maken." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:370 +#: ../webkit/webkitwebsettings.cpp:378 msgid "Print Backgrounds" msgstr "Achtergronden afdrukken" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:371 +#: ../webkit/webkitwebsettings.cpp:379 msgid "Whether background images should be printed." msgstr "Of achtergrondafbeeldingen afgedrukt moeten worden." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:379 +#: ../webkit/webkitwebsettings.cpp:387 msgid "Enable Scripts" msgstr "Scripts inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:380 +#: ../webkit/webkitwebsettings.cpp:388 msgid "Enable embedded scripting languages." msgstr "Ingebedde scripttalen inschakelen." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:388 +#: ../webkit/webkitwebsettings.cpp:396 msgid "Enable Plugins" msgstr "Plugins inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:389 +#: ../webkit/webkitwebsettings.cpp:397 msgid "Enable embedded plugin objects." msgstr "Ingebedde plugin-objecten inschakelen." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:397 +#: ../webkit/webkitwebsettings.cpp:405 msgid "Resizable Text Areas" msgstr "Tekstgebieden van grootte veranderbaar" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:398 +#: ../webkit/webkitwebsettings.cpp:406 msgid "Whether text areas are resizable." msgstr "Of de grootte van tekstgebieden gewijzigd kan worden." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:405 +#: ../webkit/webkitwebsettings.cpp:413 msgid "User Stylesheet URI" msgstr "URI van gebruikersstijlblad" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:406 +#: ../webkit/webkitwebsettings.cpp:414 msgid "The URI of a stylesheet that is applied to every page." msgstr "De URI van een stijlblad dat wordt toegepast op elke pagina." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:421 +#: ../webkit/webkitwebsettings.cpp:429 msgid "Zoom Stepping Value" msgstr "Stapgrootte voor in- en uitzoomen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:422 +#: ../webkit/webkitwebsettings.cpp:430 msgid "The value by which the zoom level is changed when zooming in or out." msgstr "" "De hoeveelheid waarmee het zoomniveau verandert bij het in- en uitzoomen." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:440 +#: ../webkit/webkitwebsettings.cpp:448 msgid "Enable Developer Extras" msgstr "Extraatjes voor ontwikkelaars" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:441 +#: ../webkit/webkitwebsettings.cpp:449 msgid "Enables special extensions that help developers" msgstr "Schakelt speciale uitbreidingen in die ontwikkelaars helpen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:461 +#: ../webkit/webkitwebsettings.cpp:469 msgid "Enable Private Browsing" msgstr "Privé-browsen inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:462 +#: ../webkit/webkitwebsettings.cpp:470 msgid "Enables private browsing mode" msgstr "Schakelt de stand voor privé-browsen in" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:477 +#: ../webkit/webkitwebsettings.cpp:485 msgid "Enable Spell Checking" msgstr "Spellingcontrole inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:478 +#: ../webkit/webkitwebsettings.cpp:486 msgid "Enables spell checking while typing" msgstr "Schakelt spellingcontrole tijdens het typen in" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:501 +#: ../webkit/webkitwebsettings.cpp:509 msgid "Languages to use for spell checking" msgstr "Te gebruiken talen bij spellingcontrole" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:502 +#: ../webkit/webkitwebsettings.cpp:510 msgid "Comma separated list of languages to use for spell checking" msgstr "Kommagescheiden lijst van talen voor spellingcontrole" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:516 +#: ../webkit/webkitwebsettings.cpp:524 msgid "Enable Caret Browsing" msgstr "Cursor-browsen inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:517 +#: ../webkit/webkitwebsettings.cpp:525 msgid "Whether to enable accesibility enhanced keyboard navigation" -msgstr "Of toegankelijkheidsgeoptimaliseerde toetsenbordnavigatie is ingeschakeld" +msgstr "" +"Of toegankelijkheidsgeoptimaliseerde toetsenbordnavigatie is ingeschakeld" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:532 +#: ../webkit/webkitwebsettings.cpp:540 msgid "Enable HTML5 Database" msgstr "HTML5-database inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:533 +#: ../webkit/webkitwebsettings.cpp:541 msgid "Whether to enable HTML5 database support" msgstr "Of HTML5-databaseondersteuning is ingeschakeld" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:548 +#: ../webkit/webkitwebsettings.cpp:556 msgid "Enable HTML5 Local Storage" msgstr "HTML5-lokale opslag inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:549 +#: ../webkit/webkitwebsettings.cpp:557 msgid "Whether to enable HTML5 Local Storage support" msgstr "Of HTML5-lokale opslag ingeschakeld moet zijn" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:563 +#: ../webkit/webkitwebsettings.cpp:571 msgid "Enable XSS Auditor" msgstr "XSS-auditor inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:564 -msgid "Whether to enable teh XSS auditor" +#: ../webkit/webkitwebsettings.cpp:572 +msgid "Whether to enable the XSS auditor" msgstr "Of de XSS-auditor is ingeschakeld" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:582 +#: ../webkit/webkitwebsettings.cpp:590 +msgid "Enable Spatial Navigation" +msgstr "Ruimtelijke navigatie inschakelen" + +#: ../webkit/webkitwebsettings.cpp:591 +msgid "Whether to enable Spatial Navigation" +msgstr "Of ruimtelijke navigatie is ingeschakeld" + +#: ../webkit/webkitwebsettings.cpp:608 msgid "User Agent" msgstr "User-agent" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:583 +#: ../webkit/webkitwebsettings.cpp:609 msgid "The User-Agent string used by WebKitGtk" msgstr "De User-Agent-tekenreeks die WebKitGtk gebruikt" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:598 +#: ../webkit/webkitwebsettings.cpp:624 msgid "JavaScript can open windows automatically" msgstr "JavaScript kan automatisch vensters openen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:599 +#: ../webkit/webkitwebsettings.cpp:625 msgid "Whether JavaScript can open windows automatically" msgstr "Of JavaScript automatisch vensters kan openen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:614 +#: ../webkit/webkitwebsettings.cpp:639 +msgid "JavaScript can access Clipboard" +msgstr "JavaScript heeft toegang tot klembord" + +#: ../webkit/webkitwebsettings.cpp:640 +msgid "Whether JavaScript can access Clipboard" +msgstr "Of JavaScript het klembord kan benaderen" + +#: ../webkit/webkitwebsettings.cpp:656 msgid "Enable offline web application cache" msgstr "Offline webapplicatiebuffer inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:615 +#: ../webkit/webkitwebsettings.cpp:657 msgid "Whether to enable offline web application cache" msgstr "Of de offline webapplicatiebuffer is ingeschakeld" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:642 +#: ../webkit/webkitwebsettings.cpp:684 msgid "Editing behavior" msgstr "Gedrag bij bewerken" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:643 +#: ../webkit/webkitwebsettings.cpp:685 msgid "The behavior mode to use in editing mode" msgstr "De gedragsmodus in de bewerkingsstand" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:659 +#: ../webkit/webkitwebsettings.cpp:701 msgid "Enable universal access from file URIs" msgstr "Universele toegang vanaf bestands-URI's inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:660 +#: ../webkit/webkitwebsettings.cpp:702 msgid "Whether to allow universal access from file URIs" msgstr "Of universele toegang vanaf bestands-URI's is ingeschakeld" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:675 +#: ../webkit/webkitwebsettings.cpp:717 msgid "Enable DOM paste" msgstr "DOM-plakken inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:676 +#: ../webkit/webkitwebsettings.cpp:718 msgid "Whether to enable DOM paste" msgstr "Of plakken vanuit het DOM is ingeschakeld" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:694 +#: ../webkit/webkitwebsettings.cpp:736 msgid "Tab key cycles through elements" msgstr "Tab-toets wandelt door elementen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:695 +#: ../webkit/webkitwebsettings.cpp:737 msgid "Whether the tab key cycles through elements on the page." msgstr "Of de tab-toets door de elementen op de pagina wandelt." -#: WebKit/gtk/webkit/webkitwebsettings.cpp:715 +#: ../webkit/webkitwebsettings.cpp:757 msgid "Enable Default Context Menu" msgstr "Standaard-contextmenu inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:716 +#: ../webkit/webkitwebsettings.cpp:758 msgid "" "Enables the handling of right-clicks for the creation of the default context " "menu" msgstr "" -"Schakelt het afhandelen van klikken met de tweede muisknop in voor het creëren " -"van het standaard contextmenu" +"Schakelt het afhandelen van klikken met de tweede muisknop in voor het " +"creëren van het standaard contextmenu" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:736 +#: ../webkit/webkitwebsettings.cpp:778 msgid "Enable Site Specific Quirks" msgstr "Site-specifieke eigenaardigheden inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:737 +#: ../webkit/webkitwebsettings.cpp:779 msgid "Enables the site-specific compatibility workarounds" msgstr "Schakelt omzeilingen in voor compatibiliteit met specifieke websites" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:759 +#: ../webkit/webkitwebsettings.cpp:801 msgid "Enable page cache" msgstr "Paginabuffer inschakelen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:760 +#: ../webkit/webkitwebsettings.cpp:802 msgid "Whether the page cache should be used" msgstr "Of de paginabuffer gebruikt moet worden" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:780 +#: ../webkit/webkitwebsettings.cpp:822 msgid "Auto Resize Window" msgstr "Venstergrootte automatisch aanpassen" -#: WebKit/gtk/webkit/webkitwebsettings.cpp:781 +#: ../webkit/webkitwebsettings.cpp:823 msgid "Automatically resize the toplevel window when a page requests it" -msgstr "Grootte van topniveauvenster automatisch aanpassen wanneer pagina hierom vraagt" +msgstr "" +"Grootte van topniveauvenster automatisch aanpassen wanneer pagina hierom " +"vraagt" + +#: ../webkit/webkitwebsettings.cpp:855 +msgid "Enable Java Applet" +msgstr "Java-applet inschakelen" + +#: ../webkit/webkitwebsettings.cpp:856 +msgid "Whether Java Applet support through <applet> should be enabled" +msgstr "Of ondersteuning voor Java-applets via <applet> ingeschakeld is" -#: WebKit/gtk/webkit/webkitwebview.cpp:2316 +#: ../webkit/webkitwebview.cpp:2640 msgid "Returns the @web_view's document title" msgstr "Geeft de documenttitel van de @web_view terug" -#: WebKit/gtk/webkit/webkitwebview.cpp:2330 +#: ../webkit/webkitwebview.cpp:2654 msgid "Returns the current URI of the contents displayed by the @web_view" msgstr "Geeft de huidige URI terug van de inhoud die de @web_view weergeeft" -#: WebKit/gtk/webkit/webkitwebview.cpp:2343 +#: ../webkit/webkitwebview.cpp:2667 msgid "Copy target list" msgstr "Kopieerdoellijst" -#: WebKit/gtk/webkit/webkitwebview.cpp:2344 +#: ../webkit/webkitwebview.cpp:2668 msgid "The list of targets this web view supports for clipboard copying" msgstr "" "De lijst met targets die deze webweergave ondersteunt voor het kopiëren van " "het klembord" -#: WebKit/gtk/webkit/webkitwebview.cpp:2357 +#: ../webkit/webkitwebview.cpp:2681 msgid "Paste target list" msgstr "Plakdoellijst" -#: WebKit/gtk/webkit/webkitwebview.cpp:2358 +#: ../webkit/webkitwebview.cpp:2682 msgid "The list of targets this web view supports for clipboard pasting" msgstr "" "De lijst met targets die deze webview ondersteunt voor het plakken van het " "klembord" -#: WebKit/gtk/webkit/webkitwebview.cpp:2364 +#: ../webkit/webkitwebview.cpp:2688 msgid "Settings" msgstr "Instellingen" -#: WebKit/gtk/webkit/webkitwebview.cpp:2365 +#: ../webkit/webkitwebview.cpp:2689 msgid "An associated WebKitWebSettings instance" msgstr "Een geassocieerde instantie van WebKitWebSettings" -#: WebKit/gtk/webkit/webkitwebview.cpp:2378 +#: ../webkit/webkitwebview.cpp:2702 msgid "Web Inspector" msgstr "Web-inspector" -#: WebKit/gtk/webkit/webkitwebview.cpp:2379 +#: ../webkit/webkitwebview.cpp:2703 msgid "The associated WebKitWebInspector instance" msgstr "De geassocieerde instantie van WebKitWebInspector" -#: WebKit/gtk/webkit/webkitwebview.cpp:2399 +#: ../webkit/webkitwebview.cpp:2723 msgid "Editable" msgstr "Bewerkbaar" -#: WebKit/gtk/webkit/webkitwebview.cpp:2400 +#: ../webkit/webkitwebview.cpp:2724 msgid "Whether content can be modified by the user" msgstr "Of de tekst gewijzigd kan worden door de gebruiker" -#: WebKit/gtk/webkit/webkitwebview.cpp:2406 +#: ../webkit/webkitwebview.cpp:2730 msgid "Transparent" msgstr "Transparant" -#: WebKit/gtk/webkit/webkitwebview.cpp:2407 +#: ../webkit/webkitwebview.cpp:2731 msgid "Whether content has a transparent background" msgstr "Of de inhoud een transparante achtergrond heeft" -#: WebKit/gtk/webkit/webkitwebview.cpp:2420 +#: ../webkit/webkitwebview.cpp:2744 msgid "Zoom level" msgstr "Zoomniveau" -#: WebKit/gtk/webkit/webkitwebview.cpp:2421 +#: ../webkit/webkitwebview.cpp:2745 msgid "The level of zoom of the content" msgstr "Zoomfactor van de inhoud" -#: WebKit/gtk/webkit/webkitwebview.cpp:2436 +#: ../webkit/webkitwebview.cpp:2760 msgid "Full content zoom" msgstr "Zoomen op volledige inhoud" -#: WebKit/gtk/webkit/webkitwebview.cpp:2437 +#: ../webkit/webkitwebview.cpp:2761 msgid "Whether the full content is scaled when zooming" msgstr "Of de volledige inhoud op schaal wordt gebracht bij het zoomen" -#: WebKit/gtk/webkit/webkitwebview.cpp:2450 -msgid "Encoding" -msgstr "Codering" - -#: WebKit/gtk/webkit/webkitwebview.cpp:2451 +#: ../webkit/webkitwebview.cpp:2775 msgid "The default encoding of the web view" msgstr "Standaard codering van de webweergave" -#: WebKit/gtk/webkit/webkitwebview.cpp:2464 +#: ../webkit/webkitwebview.cpp:2788 msgid "Custom Encoding" msgstr "Aangepaste codering" -#: WebKit/gtk/webkit/webkitwebview.cpp:2465 +#: ../webkit/webkitwebview.cpp:2789 msgid "The custom encoding of the web view" msgstr "De aangepaste codering van de webweergave" -#: WebKit/gtk/webkit/webkitwebview.cpp:2517 +#: ../webkit/webkitwebview.cpp:2841 msgid "Icon URI" msgstr "Pictogram-URI" -#: WebKit/gtk/webkit/webkitwebview.cpp:2518 +#: ../webkit/webkitwebview.cpp:2842 msgid "The URI for the favicon for the #WebKitWebView." msgstr "De URI voor het favicon van de #WebKitWebView." -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55 -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:55 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:60 msgid "Submit" msgstr "Indienen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:65 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:65 msgid "Reset" msgstr "Herinitialiseren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70 -msgid "_Searchable Index" -msgstr "Door_zoekbare index" +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:70 +msgid "This is a searchable index. Enter search keywords: " +msgstr "Dit is een doorzoekbare index. Voer zoekwoorden in: " -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:75 msgid "Choose File" msgstr "Kies een bestand" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:80 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:80 msgid "(None)" msgstr "(Geen)" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:85 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:85 msgid "Open Link in New _Window" msgstr "Verwijzing openen in _nieuw venster" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:90 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:90 msgid "_Download Linked File" msgstr "Bestand _downloaden" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:95 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:95 msgid "Copy Link Loc_ation" msgstr "Verwijzings_adres kopiëren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:100 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:100 msgid "Open _Image in New Window" msgstr "Af_beelding openen in nieuw venster" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:105 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:105 msgid "Sa_ve Image As" msgstr "Afbeelding opslaan _als…" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:110 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:110 msgid "Cop_y Image" msgstr "Afbeelding _kopiëren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:115 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:115 msgid "Open _Frame in New Window" msgstr "_Deelvenster openen in nieuw venster" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:166 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:166 msgid "_Reload" msgstr "Ve_rversen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:183 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:183 msgid "No Guesses Found" msgstr "Geen suggesties gevonden" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:188 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:188 msgid "_Ignore Spelling" msgstr "Spelling _negeren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:193 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:193 msgid "_Learn Spelling" msgstr "_Spelling leren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:198 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:198 msgid "_Search the Web" msgstr "Het web door_zoeken" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:203 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:203 msgid "_Look Up in Dictionary" msgstr "O_pzoeken in woordenboek" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:208 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:208 msgid "_Open Link" msgstr "Koppeling _openen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:213 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:213 msgid "Ignore _Grammar" msgstr "_Grammatica negeren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:218 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:218 msgid "Spelling and _Grammar" msgstr "Spelling en _grammatica" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:223 msgid "_Show Spelling and Grammar" msgstr "Spelling en grammatica _tonen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:223 msgid "_Hide Spelling and Grammar" msgstr "Spelling en grammatica ver_bergen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:228 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:228 msgid "_Check Document Now" msgstr "Het document nu _controleren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:233 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:233 msgid "Check Spelling While _Typing" msgstr "_Spelling controleren tijdens het typen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:238 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:238 msgid "Check _Grammar With Spelling" msgstr "_Grammatica controleren naast spelling" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:243 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:243 msgid "_Font" msgstr "_Lettertype" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:266 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:266 msgid "_Outline" msgstr "_Omtrek" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:271 msgid "Inspect _Element" msgstr "_Element inspecteren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:276 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:276 msgid "No recent searches" msgstr "Geen recente zoekopdrachten" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:281 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:281 msgid "Recent searches" msgstr "Recente zoekopdrachten" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:286 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:286 msgid "_Clear recent searches" msgstr "Recente zoekopdrachten _wissen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:291 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:291 msgid "term" msgstr "term" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:296 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:296 msgid "definition" msgstr "definitie" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:301 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:301 msgid "press" msgstr "druk" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:306 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:306 msgid "select" msgstr "selecteren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:311 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:311 msgid "activate" msgstr "activeren" # check / uncheck is aankruisen / deselecteren? -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:316 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:316 msgid "uncheck" msgstr "deselecteren" # check / uncheck is aankruisen / deselecteren? -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:321 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:321 msgid "check" msgstr "aankruisen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:326 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:326 msgid "jump" msgstr "springen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:342 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:341 +msgid "Missing Plug-in" +msgstr "Ontbrekende plug-in" + +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:347 +msgid "Plug-in Failure" +msgstr "Fout in plug-in" + +#. FIXME: If this file gets localized, this should really be localized as one string with a wildcard for the number. +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:353 msgid " files" msgstr " bestanden" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:347 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:358 msgid "Unknown" msgstr "Onbekend" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:363 +#, c-format +msgctxt "Title string for images" +msgid "%s (%dx%d pixels)" +msgstr "%s (%d×%d pixels)" + +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:375 msgid "Loading..." msgstr "Laden…" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:380 msgid "Live Broadcast" msgstr "Live-uitzending" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:386 msgid "audio element controller" msgstr "besturing audio-element" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:388 msgid "video element controller" msgstr "besturing video-element" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:390 msgid "mute" msgstr "dempen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:392 msgid "unmute" msgstr "geluid aan" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:394 msgid "play" msgstr "afspelen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:396 msgid "pause" msgstr "pauze" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:398 msgid "movie time" msgstr "afspeelduur" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:400 msgid "timeline slider thumb" -msgstr "" +msgstr "tijdschuifbalk-miniatuur" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:402 msgid "back 30 seconds" msgstr "30 seconden terug" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:404 msgid "return to realtime" msgstr "terug naar realtime" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:406 msgid "elapsed time" msgstr "verstreken tijd" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:408 msgid "remaining time" msgstr "tijd te gaan" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:410 msgid "status" msgstr "status" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:412 msgid "fullscreen" msgstr "volledig scherm" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:414 msgid "fast forward" msgstr "snel vooruit" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:416 msgid "fast reverse" msgstr "snel achteruit" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:418 msgid "show closed captions" msgstr "ondertiteling tonen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:420 msgid "hide closed captions" msgstr "ondertiteling verbergen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:429 msgid "audio element playback controls and status display" msgstr "afspeelbesturing en statusweergave audio-element" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:431 msgid "video element playback controls and status display" msgstr "afspeelbesturing en statusweergave video-element" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:433 msgid "mute audio tracks" msgstr "audiosporen dempen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:435 msgid "unmute audio tracks" msgstr "audiosporen laten horen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:437 msgid "begin playback" msgstr "afspelen beginnen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:439 msgid "pause playback" msgstr "afspelen pauzeren" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:441 msgid "movie time scrubber" -msgstr "" +msgstr "filmtijdscrubber" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:443 msgid "movie time scrubber thumb" -msgstr "" +msgstr "filmtijdscrubber-miniatuur" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:445 msgid "seek movie back 30 seconds" msgstr "30 seconden terugzoeken in film" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:447 msgid "return streaming movie to real time" msgstr "terugkeren naar realtime in streamende film" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:449 msgid "current movie time in seconds" msgstr "huidige filmtijd in seconden" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:451 msgid "number of seconds of movie remaining" msgstr "aantal seconden film te gaan" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:453 msgid "current movie status" msgstr "huidige filmstatus" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:455 msgid "seek quickly back" msgstr "snel achteruit zoeken" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:457 msgid "seek quickly forward" msgstr "snel vooruit zoeken" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:459 msgid "Play movie in fullscreen mode" msgstr "Film afspelen in volledig scherm" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:461 msgid "start displaying closed captions" msgstr "beginnen met tonen van ondertiteling" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:463 msgid "stop displaying closed captions" msgstr "stoppen met tonen van ondertiteling" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:472 msgid "indefinite time" msgstr "onbepaalde tijd" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:502 msgid "value missing" msgstr "waarde ontbreekt" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:508 msgid "type mismatch" msgstr "type komt niet overeen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:513 msgid "pattern mismatch" msgstr "patroon komt niet overeen" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:518 msgid "too long" msgstr "te lang" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:523 msgid "range underflow" msgstr "onder bereik" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:528 msgid "range overflow" msgstr "over bereik" -#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522 +#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:533 msgid "step mismatch" msgstr "stap komt niet overeen" + +#~ msgid "_Searchable Index" +#~ msgstr "Door_zoekbare index" diff --git a/WebKit/gtk/tests/testatk.c b/WebKit/gtk/tests/testatk.c index 9ca7c05..c8df4ef 100644 --- a/WebKit/gtk/tests/testatk.c +++ b/WebKit/gtk/tests/testatk.c @@ -44,6 +44,8 @@ static const char* contentsInTable = "<html><body><table><tr><td>foo</td><td>bar static const char* contentsInTableWithHeaders = "<html><body><table><tr><th>foo</th><th>bar</th><th colspan='2'>baz</th></tr><tr><th>qux</th><td>1</td><td>2</td><td>3</td></tr><tr><th rowspan='2'>quux</th><td>4</td><td>5</td><td>6</td></tr><tr><td>6</td><td>7</td><td>8</td></tr><tr><th>corge</th><td>9</td><td>10</td><td>11</td></tr></table><table><tr><td>1</td><td>2</td></tr><tr><td>3</td><td>4</td></tr></table></body></html>"; +static const char* formWithTextInputs = "<html><body><form><input type='text' name='entry' /></form></body></html>"; + static const char* listsOfItems = "<html><body><ul><li>text only</li><li><a href='foo'>link only</a></li><li>text and a <a href='bar'>link</a></li></ul><ol><li>text only</li><li><a href='foo'>link only</a></li><li>text and a <a href='bar'>link</a></li></ol></body></html>"; static const char* textForSelections = "<html><body><p>A paragraph with plain text</p><p>A paragraph with <a href='http://webkit.org'>a link</a> in the middle</p></body></html>"; @@ -761,7 +763,7 @@ static void testWekitAtkTextSelections(void) webkit_web_view_load_string(webView, textForSelections, NULL, NULL, NULL); loop = g_main_loop_new(NULL, TRUE); - g_timeout_add(100, (GSourceFunc)bail_out, loop); + g_idle_add((GSourceFunc)bail_out, loop); g_main_loop_run(loop); obj = gtk_widget_get_accessible(GTK_WIDGET(webView)); @@ -859,7 +861,7 @@ static void testWekitAtkTextSelections(void) g_object_unref(webView); } -static void test_webkit_atk_get_extents(void) +static void testWebkitAtkGetExtents(void) { WebKitWebView* webView; AtkObject* obj; @@ -872,7 +874,7 @@ static void test_webkit_atk_get_extents(void) webkit_web_view_load_string(webView, centeredContents, NULL, NULL, NULL); loop = g_main_loop_new(NULL, TRUE); - g_timeout_add(100, (GSourceFunc)bail_out, loop); + g_idle_add((GSourceFunc)bail_out, loop); g_main_loop_run(loop); obj = gtk_widget_get_accessible(GTK_WIDGET(webView)); @@ -964,38 +966,32 @@ static void test_webkit_atk_get_extents(void) static void testWebkitAtkListsOfItems(void) { - WebKitWebView* webView; - AtkObject* obj; - AtkObject* uList; - AtkObject* oList; - AtkObject* item1; - AtkObject* item2; - AtkObject* item3; - GMainLoop* loop; - - webView = WEBKIT_WEB_VIEW(webkit_web_view_new()); + WebKitWebView* webView = WEBKIT_WEB_VIEW(webkit_web_view_new()); g_object_ref_sink(webView); GtkAllocation alloc = { 0, 0, 800, 600 }; gtk_widget_size_allocate(GTK_WIDGET(webView), &alloc); webkit_web_view_load_string(webView, listsOfItems, NULL, NULL, NULL); - loop = g_main_loop_new(NULL, TRUE); + GMainLoop* loop = g_main_loop_new(NULL, TRUE); - g_timeout_add(100, (GSourceFunc)bail_out, loop); + g_idle_add((GSourceFunc)bail_out, loop); g_main_loop_run(loop); - obj = gtk_widget_get_accessible(GTK_WIDGET(webView)); + AtkObject* obj = gtk_widget_get_accessible(GTK_WIDGET(webView)); g_assert(obj); // Unordered list - uList = atk_object_ref_accessible_child(obj, 0); + AtkObject* uList = atk_object_ref_accessible_child(obj, 0); g_assert(ATK_OBJECT(uList)); g_assert(atk_object_get_role(uList) == ATK_ROLE_LIST); g_assert_cmpint(atk_object_get_n_accessible_children(uList), ==, 3); - item1 = atk_object_ref_accessible_child(uList, 0); - item2 = atk_object_ref_accessible_child(uList, 1); - item3 = atk_object_ref_accessible_child(uList, 2); + AtkObject* item1 = atk_object_ref_accessible_child(uList, 0); + g_assert(ATK_IS_TEXT(item1)); + AtkObject* item2 = atk_object_ref_accessible_child(uList, 1); + g_assert(ATK_IS_TEXT(item2)); + AtkObject* item3 = atk_object_ref_accessible_child(uList, 2); + g_assert(ATK_IS_TEXT(item3)); g_assert_cmpint(atk_object_get_n_accessible_children(item1), ==, 0); g_assert_cmpint(atk_object_get_n_accessible_children(item2), ==, 1); @@ -1011,18 +1007,21 @@ static void testWebkitAtkListsOfItems(void) // Ordered list - oList = atk_object_ref_accessible_child(obj, 1); + AtkObject* oList = atk_object_ref_accessible_child(obj, 1); g_assert(ATK_OBJECT(oList)); g_assert(atk_object_get_role(oList) == ATK_ROLE_LIST); g_assert_cmpint(atk_object_get_n_accessible_children(oList), ==, 3); item1 = atk_object_ref_accessible_child(oList, 0); + g_assert(ATK_IS_TEXT(item1)); item2 = atk_object_ref_accessible_child(oList, 1); + g_assert(ATK_IS_TEXT(item2)); item3 = atk_object_ref_accessible_child(oList, 2); + g_assert(ATK_IS_TEXT(item3)); - g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item1), 0, -1), ==, "1 text only"); - g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item2), 0, -1), ==, "2 link only"); - g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item3), 0, -1), ==, "3 text and a link"); + g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item1), 0, -1), ==, "1. text only"); + g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item2), 0, -1), ==, "2. link only"); + g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item3), 0, -1), ==, "3. text and a link"); g_assert_cmpint(atk_object_get_n_accessible_children(item1), ==, 0); g_assert_cmpint(atk_object_get_n_accessible_children(item2), ==, 1); @@ -1037,6 +1036,68 @@ static void testWebkitAtkListsOfItems(void) g_object_unref(webView); } +static gboolean textInserted = FALSE; +static gboolean textDeleted = FALSE; + +static void textChangedCb(AtkText* text, gint pos, gint len, const gchar* detail) +{ + g_assert(text && ATK_IS_OBJECT(text)); + + if (!g_strcmp0(detail, "insert")) + textInserted = TRUE; + else if (!g_strcmp0(detail, "delete")) + textDeleted = TRUE; +} + +static gboolean checkTextChanges(gpointer unused) +{ + g_assert_cmpint(textInserted, ==, TRUE); + g_assert_cmpint(textDeleted, ==, TRUE); + return FALSE; +} + +static void testWebkitAtkTextChangedNotifications(void) +{ + WebKitWebView* webView = WEBKIT_WEB_VIEW(webkit_web_view_new()); + g_object_ref_sink(webView); + GtkAllocation alloc = { 0, 0, 800, 600 }; + gtk_widget_size_allocate(GTK_WIDGET(webView), &alloc); + webkit_web_view_load_string(webView, formWithTextInputs, 0, 0, 0); + + // Manually spin the main context to get the accessible objects + while (g_main_context_pending(0)) + g_main_context_iteration(0, TRUE); + + AtkObject* obj = gtk_widget_get_accessible(GTK_WIDGET(webView)); + g_assert(obj); + + AtkObject* form = atk_object_ref_accessible_child(obj, 0); + g_assert(ATK_IS_OBJECT(form)); + + AtkObject* textEntry = atk_object_ref_accessible_child(form, 0); + g_assert(ATK_IS_EDITABLE_TEXT(textEntry)); + g_assert(atk_object_get_role(ATK_OBJECT(textEntry)) == ATK_ROLE_ENTRY); + + g_signal_connect(textEntry, "text-changed::insert", + G_CALLBACK(textChangedCb), + (gpointer)"insert"); + g_signal_connect(textEntry, "text-changed::delete", + G_CALLBACK(textChangedCb), + (gpointer)"delete"); + + gint pos = 0; + atk_editable_text_insert_text(ATK_EDITABLE_TEXT(textEntry), "foo bar baz", 11, &pos); + atk_editable_text_delete_text(ATK_EDITABLE_TEXT(textEntry), 4, 7); + textInserted = FALSE; + textDeleted = FALSE; + + g_idle_add((GSourceFunc)checkTextChanges, 0); + + g_object_unref(form); + g_object_unref(textEntry); + g_object_unref(webView); +} + int main(int argc, char** argv) { g_thread_init(NULL); @@ -1054,8 +1115,9 @@ int main(int argc, char** argv) g_test_add_func("/webkit/atk/getHeadersInTable", testWebkitAtkGetHeadersInTable); g_test_add_func("/webkit/atk/textAttributes", testWebkitAtkTextAttributes); g_test_add_func("/webkit/atk/textSelections", testWekitAtkTextSelections); - g_test_add_func("/webkit/atk/get_extents", test_webkit_atk_get_extents); + g_test_add_func("/webkit/atk/getExtents", testWebkitAtkGetExtents); g_test_add_func("/webkit/atk/listsOfItems", testWebkitAtkListsOfItems); + g_test_add_func("/webkit/atk/textChangedNotifications", testWebkitAtkTextChangedNotifications); return g_test_run (); } diff --git a/WebKit/gtk/tests/testmimehandling.c b/WebKit/gtk/tests/testmimehandling.c index 3a0eded..2d6c623 100644 --- a/WebKit/gtk/tests/testmimehandling.c +++ b/WebKit/gtk/tests/testmimehandling.c @@ -134,8 +134,9 @@ static gboolean mime_type_policy_decision_requested_cb(WebKitWebView* view, WebK return FALSE; } -static void test_mime_type(const char* name) +static void testRemoteMimeType(const void* data) { + const char* name = (const char*) data; WebKitWebView* view = WEBKIT_WEB_VIEW(webkit_web_view_new()); g_object_ref_sink(G_OBJECT(view)); @@ -155,24 +156,31 @@ static void test_mime_type(const char* name) g_object_unref(view); } -static void test_mime_pdf() +static void testLocalMimeType(const void* data) { - test_mime_type("pdf"); -} + const char* typeName = (const char*) data; + WebKitWebView* view = WEBKIT_WEB_VIEW(webkit_web_view_new()); + g_object_ref_sink(G_OBJECT(view)); -static void test_mime_html() -{ - test_mime_type("html"); -} + loop = g_main_loop_new(NULL, TRUE); -static void test_mime_text() -{ - test_mime_type("text"); -} + g_object_connect(G_OBJECT(view), + "signal::notify::load-status", idle_quit_loop_cb, NULL, + "signal::mime-type-policy-decision-requested", mime_type_policy_decision_requested_cb, g_strdup(typeName), + NULL); -static void test_mime_ogg() -{ - test_mime_type("ogg"); + gchar* filename = g_strdup_printf("test.%s", typeName); + GFile* file = g_file_new_for_path(filename); + g_free(filename); + + gchar* fileURI = g_file_get_uri(file); + g_object_unref(file); + + webkit_web_view_load_uri(view, fileURI); + g_free(fileURI); + + g_main_loop_run(loop); + g_object_unref(view); } int main(int argc, char** argv) @@ -198,10 +206,14 @@ int main(int argc, char** argv) soup_uri_free(soup_uri); g_test_bug_base("https://bugs.webkit.org/"); - g_test_add_func("/webkit/mime/PDF", test_mime_pdf); - g_test_add_func("/webkit/mime/HTML", test_mime_html); - g_test_add_func("/webkit/mime/TEXT", test_mime_text); - g_test_add_func("/webkit/mime/OGG", test_mime_ogg); + g_test_add_data_func("/webkit/mime/remote-PDF", "pdf", testRemoteMimeType); + g_test_add_data_func("/webkit/mime/remote-HTML", "html", testRemoteMimeType); + g_test_add_data_func("/webkit/mime/remote-TEXT", "text", testRemoteMimeType); + g_test_add_data_func("/webkit/mime/remote-OGG", "ogg", testRemoteMimeType); + g_test_add_data_func("/webkit/mime/local-PDF", "pdf", testLocalMimeType); + g_test_add_data_func("/webkit/mime/local-HTML", "html", testLocalMimeType); + g_test_add_data_func("/webkit/mime/local-TEXT", "text", testLocalMimeType); + g_test_add_data_func("/webkit/mime/local-OGG", "ogg", testLocalMimeType); return g_test_run(); } diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp index 1e45250..1472cb5 100644 --- a/WebKit/gtk/webkit/webkitdownload.cpp +++ b/WebKit/gtk/webkit/webkitdownload.cpp @@ -559,7 +559,7 @@ const gchar* webkit_download_get_uri(WebKitDownload* download) * Retrieves the #WebKitNetworkRequest object that backs the download * process. * - * Returns: the #WebKitNetworkRequest instance + * Returns: (transfer none): the #WebKitNetworkRequest instance * * Since: 1.1.2 */ @@ -578,7 +578,7 @@ WebKitNetworkRequest* webkit_download_get_network_request(WebKitDownload* downlo * Retrieves the #WebKitNetworkResponse object that backs the download * process. * - * Returns: the #WebKitNetworkResponse instance + * Returns: (transfer none): the #WebKitNetworkResponse instance * * Since: 1.1.16 */ diff --git a/WebKit/gtk/webkit/webkitnetworkrequest.cpp b/WebKit/gtk/webkit/webkitnetworkrequest.cpp index 8b50948..6180efa 100644 --- a/WebKit/gtk/webkit/webkitnetworkrequest.cpp +++ b/WebKit/gtk/webkit/webkitnetworkrequest.cpp @@ -241,7 +241,7 @@ G_CONST_RETURN gchar* webkit_network_request_get_uri(WebKitNetworkRequest* reque } /** - * webkit_network_request_get_soup_message: + * webkit_network_request_get_message: * @request: a #WebKitNetworkRequest * * Obtains the #SoupMessage held and used by the given request. Notice @@ -249,7 +249,7 @@ G_CONST_RETURN gchar* webkit_network_request_get_uri(WebKitNetworkRequest* reque * handlers is only supported (as in, will only affect what is * actually sent to the server) where explicitly documented. * - * Returns: the #SoupMessage + * Returns: (transfer none): the #SoupMessage * Since: 1.1.9 */ SoupMessage* webkit_network_request_get_message(WebKitNetworkRequest* request) diff --git a/WebKit/gtk/webkit/webkitnetworkresponse.cpp b/WebKit/gtk/webkit/webkitnetworkresponse.cpp index d4dd562..0aca6d8 100644 --- a/WebKit/gtk/webkit/webkitnetworkresponse.cpp +++ b/WebKit/gtk/webkit/webkitnetworkresponse.cpp @@ -241,14 +241,14 @@ G_CONST_RETURN gchar* webkit_network_response_get_uri(WebKitNetworkResponse* res } /** - * webkit_network_response_get_soup_message: + * webkit_network_response_get_message: * @response: a #WebKitNetworkResponse * * Obtains the #SoupMessage that represents the given response. Notice * that only the response side of the HTTP conversation is * represented. * - * Returns: the #SoupMessage + * Returns: (transfer none): the #SoupMessage * Since: 1.1.14 */ SoupMessage* webkit_network_response_get_message(WebKitNetworkResponse* response) diff --git a/WebKit/gtk/webkit/webkitsecurityorigin.cpp b/WebKit/gtk/webkit/webkitsecurityorigin.cpp index de074ae..67ad0cf 100644 --- a/WebKit/gtk/webkit/webkitsecurityorigin.cpp +++ b/WebKit/gtk/webkit/webkitsecurityorigin.cpp @@ -353,7 +353,8 @@ void webkit_security_origin_set_web_database_quota(WebKitSecurityOrigin* securit * * Returns a list of all Web Databases in the security origin. * - * Returns: a #GList of databases in the security origin. + * Returns: (transfer container) (element-type WebKitWebDatabase): a + * #GList of databases in the security origin. * * Since: 1.1.14 **/ diff --git a/WebKit/gtk/webkit/webkitwebdatabase.cpp b/WebKit/gtk/webkit/webkitwebdatabase.cpp index d4f6198..cd85e73 100644 --- a/WebKit/gtk/webkit/webkitwebdatabase.cpp +++ b/WebKit/gtk/webkit/webkitwebdatabase.cpp @@ -284,7 +284,7 @@ static void webkit_web_database_set_name(WebKitWebDatabase* webDatabase, const g * * Returns the security origin of the #WebKitWebDatabase. * - * Returns: the security origin of the database + * Returns: (transfer none): the security origin of the database * * Since: 1.1.14 **/ diff --git a/WebKit/gtk/webkit/webkitwebdatasource.cpp b/WebKit/gtk/webkit/webkitwebdatasource.cpp index 9b755ad..38c9c48 100644 --- a/WebKit/gtk/webkit/webkitwebdatasource.cpp +++ b/WebKit/gtk/webkit/webkitwebdatasource.cpp @@ -194,14 +194,15 @@ WebKitWebDataSource* webkit_web_data_source_new_with_request(WebKitNetworkReques } /** - * webkit_web_data_source_get_web_frame + * webkit_web_data_source_get_web_frame: * @data_source: a #WebKitWebDataSource * * Returns the #WebKitWebFrame that represents this data source * - * Return value: the #WebKitWebFrame that represents the @data_source. The - * #WebKitWebFrame is owned by WebKit and should not be freed or destroyed. - * This will return %NULL of the @data_source is not attached to a frame. + * Return value: (transfer none): the #WebKitWebFrame that represents + * the @data_source. The #WebKitWebFrame is owned by WebKit and should + * not be freed or destroyed. This will return %NULL if the + * @data_source is not attached to a frame. * * Since: 1.1.14 */ @@ -227,7 +228,7 @@ WebKitWebFrame* webkit_web_data_source_get_web_frame(WebKitWebDataSource* webDat * prior to the "committed" load state. See webkit_web_data_source_get_request * for getting the "committed" request. * - * Return value: the original #WebKitNetworkRequest + * Return value: (transfer none): the original #WebKitNetworkRequest * * Since: 1.1.14 */ @@ -254,9 +255,9 @@ WebKitNetworkRequest* webkit_web_data_source_get_initial_request(WebKitWebDataSo * the request that was "committed", and hence, different from the request you * get from the webkit_web_data_source_get_initial_request method. * - * Return value: the #WebKitNetworkRequest that created the @data_source or - * %NULL if the @data_source is not attached to the frame or the frame hasn't - * been loaded. + * Return value: (transfer none): the #WebKitNetworkRequest that + * created the @data_source or %NULL if the @data_source is not + * attached to the frame or the frame hasn't been loaded. * * Since: 1.1.14 */ @@ -333,8 +334,9 @@ gboolean webkit_web_data_source_is_loading(WebKitWebDataSource* webDataSource) * frame hasn't loaded any data. Use webkit_web_data_source_is_loading to test * if data source is in the process of loading. * - * Return value: a #GString which contains the raw data that represents the @data_source or %NULL if the - * @data_source hasn't loaded any data. + * Return value: (transfer none): a #GString which contains the raw + * data that represents the @data_source or %NULL if the @data_source + * hasn't loaded any data. * * Since: 1.1.14 */ @@ -364,8 +366,8 @@ GString* webkit_web_data_source_get_data(WebKitWebDataSource* webDataSource) * * Returns the main resource of the @data_source * - * Return value: a new #WebKitWebResource representing the main resource of - * the @data_source. + * Return value: (transfer none): a new #WebKitWebResource + * representing the main resource of the @data_source. * * Since: 1.1.14 */ @@ -414,14 +416,15 @@ G_CONST_RETURN gchar* webkit_web_data_source_get_unreachable_uri(WebKitWebDataSo } /** - * webkit_web_data_source_get_subresources + * webkit_web_data_source_get_subresources: * @data_source: a #WebKitWebDataSource * * Gives you a #GList of #WebKitWebResource objects that compose the * #WebKitWebView to which this #WebKitWebDataSource is attached. * - * Return value: a #GList of #WebKitWebResource objects; the objects are - * owned by WebKit, but the GList must be freed. + * Return value: (element-type WebKitWebResource) (transfer container): + * a #GList of #WebKitWebResource objects; the objects are owned by + * WebKit, but the GList must be freed. * * Since: 1.1.15 */ diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp index 88f0bb7..c581ce6 100644 --- a/WebKit/gtk/webkit/webkitwebframe.cpp +++ b/WebKit/gtk/webkit/webkitwebframe.cpp @@ -449,7 +449,7 @@ G_CONST_RETURN gchar* webkit_web_frame_get_uri(WebKitWebFrame* frame) * The #WebKitWebView returned manages the entire hierarchy of #WebKitWebFrame * objects that contains @frame. * - * Return value: the #WebKitWebView that manages @frame + * Return value: (transfer none): the #WebKitWebView that manages @frame */ WebKitWebView* webkit_web_frame_get_web_view(WebKitWebFrame* frame) { @@ -491,7 +491,7 @@ G_CONST_RETURN gchar* webkit_web_frame_get_name(WebKitWebFrame* frame) * * Returns the @frame's parent frame, or %NULL if it has none. * - * Return value: the parent #WebKitWebFrame or %NULL in case there is none + * Return value: (transfer none): the parent #WebKitWebFrame or %NULL in case there is none */ WebKitWebFrame* webkit_web_frame_get_parent(WebKitWebFrame* frame) { @@ -662,7 +662,7 @@ void webkit_web_frame_reload(WebKitWebFrame* frame) * hierarchy, this function will search for a matching frame in other main * frame hierarchies. Returns %NULL if no match is found. * - * Return value: the found #WebKitWebFrame or %NULL in case none is found + * Return value: (transfer none): the found #WebKitWebFrame or %NULL in case none is found */ WebKitWebFrame* webkit_web_frame_find_frame(WebKitWebFrame* frame, const gchar* name) { @@ -684,7 +684,7 @@ WebKitWebFrame* webkit_web_frame_find_frame(WebKitWebFrame* frame, const gchar* * Gets the global JavaScript execution context. Use this function to bridge * between the WebKit and JavaScriptCore APIs. * - * Return value: the global JavaScript context + * Return value: (transfer none): the global JavaScript context */ JSGlobalContextRef webkit_web_frame_get_global_context(WebKitWebFrame* frame) { @@ -703,7 +703,7 @@ JSGlobalContextRef webkit_web_frame_get_global_context(WebKitWebFrame* frame) * * Returns the committed data source. * - * Return value: the committed #WebKitWebDataSource. + * Return value: (transfer none): the committed #WebKitWebDataSource. * * Since: 1.1.14 */ @@ -724,7 +724,7 @@ WebKitWebDataSource* webkit_web_frame_get_data_source(WebKitWebFrame* frame) * transition to a committed data source once any data has been received. Use * webkit_web_frame_get_data_source to get the committed data source. * - * Return value: the provisional #WebKitWebDataSource or %NULL if a load + * Return value: (transfer none): the provisional #WebKitWebDataSource or %NULL if a load * request is not in progress. * * Since: 1.1.14 @@ -1199,7 +1199,7 @@ GtkPolicyType webkit_web_frame_get_vertical_scrollbar_policy(WebKitWebFrame* fra * * Returns the @frame's security origin. * - * Return value: the security origin of @frame + * Return value: (transfer none): the security origin of @frame * * Since: 1.1.14 */ @@ -1241,7 +1241,7 @@ void webkit_web_frame_layout(WebKitWebFrame* frame) * frame was not created by a load. You must unref the object when you * are done with it. * - * Return value: a #WebKitNetworkResponse object + * Return value: (transfer full): a #WebKitNetworkResponse object * * Since: 1.1.18 */ diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp index 8a9153c..ce30704 100644 --- a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp +++ b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp @@ -433,14 +433,14 @@ gdouble webkit_web_history_item_get_last_visited_time(WebKitWebHistoryItem* webH } /** - * webkit_web_history_item_copy : + * webkit_web_history_item_copy: * @web_history_item: a #WebKitWebHistoryItem * * Makes a copy of the item for use with other WebView objects. * * Since: 1.1.18 * - * Return value: the new #WebKitWebHistoryItem. + * Return value: (transfer full): the new #WebKitWebHistoryItem. */ WebKitWebHistoryItem* webkit_web_history_item_copy(WebKitWebHistoryItem* self) { diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp index 2dc9315..ee3c8cd 100644 --- a/WebKit/gtk/webkit/webkitwebinspector.cpp +++ b/WebKit/gtk/webkit/webkitwebinspector.cpp @@ -426,8 +426,8 @@ void webkit_web_inspector_set_web_view(WebKitWebInspector *web_inspector, WebKit * that this method may return %NULL if the user hasn't inspected * anything. * - * Returns: the #WebKitWebView instance that is used to render the - * inspector or %NULL if it is not yet created. + * Returns: (transfer none): the #WebKitWebView instance that is used + * to render the inspector or %NULL if it is not yet created. * * Since: 1.0.3 **/ diff --git a/WebKit/gtk/webkit/webkitwebresource.cpp b/WebKit/gtk/webkit/webkitwebresource.cpp index ba9c3af..fb0acfc 100644 --- a/WebKit/gtk/webkit/webkitwebresource.cpp +++ b/WebKit/gtk/webkit/webkitwebresource.cpp @@ -285,8 +285,9 @@ WebKitWebResource* webkit_web_resource_new(const gchar* data, * * Returns the data of the @webResource. * - * Return value: a #GString containing the character data of the @webResource. - * The string is owned by WebKit and should not be freed or destroyed. + * Return value: (transfer none): a #GString containing the character + * data of the @webResource. The string is owned by WebKit and should + * not be freed or destroyed. * * Since: 1.1.14 */ diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp index 767fce1..8a207d9 100644 --- a/WebKit/gtk/webkit/webkitwebsettings.cpp +++ b/WebKit/gtk/webkit/webkitwebsettings.cpp @@ -108,6 +108,7 @@ struct _WebKitWebSettingsPrivate { gboolean enable_page_cache; gboolean auto_resize_window; gboolean enable_java_applet; + gboolean enable_hyperlink_auditing; }; #define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate)) @@ -157,7 +158,8 @@ enum { PROP_ENABLE_SITE_SPECIFIC_QUIRKS, PROP_ENABLE_PAGE_CACHE, PROP_AUTO_RESIZE_WINDOW, - PROP_ENABLE_JAVA_APPLET + PROP_ENABLE_JAVA_APPLET, + PROP_ENABLE_HYPERLINK_AUDITING }; // Create a default user agent string @@ -863,6 +865,21 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass) TRUE, flags)); + /** + * WebKitWebSettings:enable-hyperlink-auditing: + * + * Enable or disable support for <a ping>. + * + * Since: 1.2.5 + */ + g_object_class_install_property(gobject_class, + PROP_ENABLE_HYPERLINK_AUDITING, + g_param_spec_boolean("enable-hyperlink-auditing", + _("Enable Hyperlink Auditing"), + _("Whether <a ping> should be able to send pings"), + FALSE, + flags)); + g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate)); } @@ -1083,6 +1100,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con case PROP_ENABLE_JAVA_APPLET: priv->enable_java_applet = g_value_get_boolean(value); break; + case PROP_ENABLE_HYPERLINK_AUDITING: + priv->enable_hyperlink_auditing = g_value_get_boolean(value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -1224,6 +1244,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa case PROP_ENABLE_JAVA_APPLET: g_value_set_boolean(value, priv->enable_java_applet); break; + case PROP_ENABLE_HYPERLINK_AUDITING: + g_value_set_boolean(value, priv->enable_hyperlink_auditing); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -1248,7 +1271,7 @@ WebKitWebSettings* webkit_web_settings_new() * * Copies an existing #WebKitWebSettings instance. * - * Returns: a new #WebKitWebSettings instance + * Returns: (transfer full): a new #WebKitWebSettings instance **/ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings) { @@ -1297,6 +1320,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings) "enable-page-cache", priv->enable_page_cache, "auto-resize-window", priv->auto_resize_window, "enable-java-applet", priv->enable_java_applet, + "enable-hyperlink-auditing", priv->enable_hyperlink_auditing, NULL)); return copy; diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp index 3212450..762888a 100644 --- a/WebKit/gtk/webkit/webkitwebview.cpp +++ b/WebKit/gtk/webkit/webkitwebview.cpp @@ -1503,7 +1503,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) * the new #WebKitWebView. The widget to which the widget is added will * handle that. * - * Return value: a newly allocated #WebKitWebView, or %NULL + * Return value: (transfer full): a newly allocated #WebKitWebView, or %NULL * * Since: 1.0.3 */ @@ -2264,7 +2264,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) * to set the property value of "webkit-widget-is-selected". This can * be used to draw a visual indicator of the selection. * - * Return value: a new #GtkWidget, or %NULL + * Return value: (transfer full): a new #GtkWidget, or %NULL * * Since: 1.1.8 */ @@ -2853,7 +2853,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) javaScriptCanAccessClipboard, enableOfflineWebAppCache, enableUniversalAccessFromFileURI, enableFileAccessFromFileURI, enableDOMPaste, tabKeyCyclesThroughElements, - enableSiteSpecificQuirks, usePageCache, enableJavaApplet; + enableSiteSpecificQuirks, usePageCache, enableJavaApplet, enableHyperlinkAuditing; WebKitEditingBehavior editingBehavior; @@ -2890,6 +2890,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) "enable-site-specific-quirks", &enableSiteSpecificQuirks, "enable-page-cache", &usePageCache, "enable-java-applet", &enableJavaApplet, + "enable-hyperlink-auditing", &enableHyperlinkAuditing, NULL); settings->setDefaultTextEncodingName(defaultEncoding); @@ -2925,6 +2926,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) settings->setNeedsSiteSpecificQuirks(enableSiteSpecificQuirks); settings->setUsesPageCache(usePageCache); settings->setJavaEnabled(enableJavaApplet); + settings->setHyperlinkAuditingEnabled(enableHyperlinkAuditing); Page* page = core(webView); if (page) @@ -3036,6 +3038,8 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar settings->setUsesPageCache(g_value_get_boolean(&value)); else if (name == g_intern_string("enable-java-applet")) settings->setJavaEnabled(g_value_get_boolean(&value)); + else if (name == g_intern_string("enable-hyperlink-auditing")) + settings->setHyperlinkAuditingEnabled(g_value_get_boolean(&value)); else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name)) g_warning("Unexpected setting '%s'", name); g_value_unset(&value); @@ -3217,7 +3221,7 @@ static void webkit_web_view_set_window_features(WebKitWebView* webView, WebKitWe } /** - * webkit_web_view_get_window_features + * webkit_web_view_get_window_features: * @web_view: a #WebKitWebView * * Returns the instance of #WebKitWebWindowFeatures held by the given @@ -3642,12 +3646,19 @@ void webkit_web_view_unmark_text_matches(WebKitWebView* webView) return core(webView)->unmarkAllTextMatches(); } +/** + * webkit_web_view_get_main_frame: + * @webView: a #WebKitWebView + * + * Returns the main frame for the @webView. + * + * Return value: (transfer none): the main #WebKitWebFrame for @webView + */ WebKitWebFrame* webkit_web_view_get_main_frame(WebKitWebView* webView) { g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); - WebKitWebViewPrivate* priv = webView->priv; - return priv->mainFrame; + return webView->priv->mainFrame; } /** @@ -3656,7 +3667,7 @@ WebKitWebFrame* webkit_web_view_get_main_frame(WebKitWebView* webView) * * Returns the frame that has focus or an active text selection. * - * Return value: The focused #WebKitWebFrame or %NULL if no frame is focused + * Return value: (transfer none): The focused #WebKitWebFrame or %NULL if no frame is focused */ WebKitWebFrame* webkit_web_view_get_focused_frame(WebKitWebView* webView) { @@ -4532,7 +4543,7 @@ void webkit_web_view_set_tooltip_text(WebKitWebView* webView, const char* toolti * Does a 'hit test' in the coordinates specified by @event to figure * out context information about that position in the @webView. * - * Returns: a newly created #WebKitHitTestResult with the context of the + * Returns: (transfer none): a newly created #WebKitHitTestResult with the context of the * specified position. * * Since: 1.1.15 @@ -4574,7 +4585,7 @@ G_CONST_RETURN gchar* webkit_web_view_get_icon_uri(WebKitWebView* webView) * webkit_web_view_get_dom_document: * @webView: a #WebKitWebView * - * Returns: the #WebKitDOMDocument currently loaded in the @webView + * Returns: (transfer none): the #WebKitDOMDocument currently loaded in the @webView * * Since: 1.3.1 **/ |